Dan Oconnor a31af70c57 Details customizations re-enabled for the diff (and merge) tool. Now relying on the list of displayed properties from the details view when performing a CDO diff. This allows us to display changes to reference member variables. ...

#jira UE-19958

[CL 2666619 by Dan Oconnor in Main branch]

2015-08-24 16:25:51 -04:00

..

BlueprintMergeData.h

…

Merge.cpp

Updated revision display to display strings rather than revision indices

2015-01-20 05:48:14 -05:00

MergePrivatePCH.h

…

MergeUtils.cpp

Updated revision display to display strings rather than revision indices

2015-01-20 05:48:14 -05:00

MergeUtils.h

…

SBlueprintMerge.cpp

[UE-10822] We weren't handling trivial case of accepting the blueprint with no changes as the merge resolution, also we weren't closing existing blueprint editors

2015-02-25 21:42:38 -05:00

SBlueprintMerge.h

Fixes for blueprint merge tool when run on assets that aren't conflictng (!IsActivelyMerging when merge is initiated)

2014-12-18 18:17:28 -05:00

SMergeAssetPickerView.cpp

Add includes to files to remove the need of including Engine.h.

2015-04-10 03:30:54 -04:00

SMergeAssetPickerView.h

…

SMergeDetailsView.cpp

Details customizations re-enabled for the diff (and merge) tool. Now relying on the list of displayed properties from the details view when performing a CDO diff. This allows us to display changes to reference member variables.

2015-08-24 16:25:51 -04:00

SMergeDetailsView.h

…

SMergeGraphView.cpp

Fix shadowed variables

2015-03-03 12:30:55 -05:00

SMergeGraphView.h

…

SMergeTreeView.cpp

Fix shadowed variables

2015-03-03 12:30:55 -05:00

SMergeTreeView.h

[UE-10016] Fix BP merge tool crash when attempting to view component diffs.

2015-02-20 17:26:02 -05:00