Dan Oconnor fa76c73bd2 #UE4 fix for not all fields being hidden in details view of diff panel when 'show differing' is selected. Made the 'differing' filter a whitelist, rather than a blacklist. There are still bugs involving diffing of structures that have aggregate structures. Possibly also arrays and member objects depending on what the details view does with them. ...

[CL 2271403 by Dan Oconnor in Main branch]

2014-08-25 19:23:04 -04:00

..

Private

#UE4 fix for not all fields being hidden in details view of diff panel when 'show differing' is selected. Made the 'differing' filter a whitelist, rather than a blacklist. There are still bugs involving diffing of structures that have aggregate structures. Possibly also arrays and member objects depending on what the details view does with them.

2014-08-25 19:23:04 -04:00

Public

#UE4 blueprintmerge no longer has buttons, binds to blueprint editor. No longer inherits from SBlueprintDiff.

2014-08-05 14:46:11 -04:00

Merge.Build.cs

#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge

2014-06-25 13:25:21 -04:00