Dan Oconnor 9f2f87ad61 #UE4 Removed some ill advised buttons (take local, take remote, auto merge are difficult to implement for all blueprints), tweaked ownership (bluepint merge tool can keep shared ptr to blueprint editor - verified no shared ptr cycle when closing blueprint editor), corrected merge-accepted logic for embedded blueprint merge widget ...

[CL 2182173 by Dan Oconnor in Main branch]

2014-07-09 16:15:29 -04:00

..

Private

#UE4 Removed some ill advised buttons (take local, take remote, auto merge are difficult to implement for all blueprints), tweaked ownership (bluepint merge tool can keep shared ptr to blueprint editor - verified no shared ptr cycle when closing blueprint editor), corrected merge-accepted logic for embedded blueprint merge widget

2014-07-09 16:15:29 -04:00

Public

#UE4 Merge panel more correctly integrated into blueprint editor, ownership cleaned up, cancel action restored...

2014-07-09 13:18:10 -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