Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)

#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
This commit is contained in:
jeanmichel dignard
2020-01-07 15:54:23 -05:00
parent 735dca989e
commit 2ce7666d2d
1765 changed files with 46142 additions and 19499 deletions

View File

@@ -129,7 +129,7 @@ void FBehaviorTreeEditor::PostRedo(bool bSuccess)
FAIGraphEditor::PostRedo(bSuccess);
}
void FBehaviorTreeEditor::NotifyPostChange( const FPropertyChangedEvent& PropertyChangedEvent, UProperty* PropertyThatChanged )
void FBehaviorTreeEditor::NotifyPostChange( const FPropertyChangedEvent& PropertyChangedEvent, FProperty* PropertyThatChanged )
{
if(PropertyChangedEvent.ChangeType != EPropertyChangeType::Interactive)
{

View File

@@ -60,7 +60,7 @@ public:
// End of FEditorUndoClient
//~ Begin FNotifyHook Interface
virtual void NotifyPostChange( const FPropertyChangedEvent& PropertyChangedEvent, UProperty* PropertyThatChanged ) override;
virtual void NotifyPostChange( const FPropertyChangedEvent& PropertyChangedEvent, FProperty* PropertyThatChanged ) override;
// End of FNotifyHook
// Delegates

View File

@@ -276,7 +276,7 @@ private:
GetObjectsWithOuter(Asset->GetOutermost(), Objects);
for (const auto& SubObject : Objects)
{
for (TFieldIterator<UStructProperty> It(SubObject->GetClass()); It; ++It)
for (TFieldIterator<FStructProperty> It(SubObject->GetClass()); It; ++It)
{
if (It->GetCPPType(NULL, CPPF_None).Contains(GET_STRUCT_NAME_CHECKED(FBlackboardKeySelector)))
{