Marc Audy
79f610442c
Fix shadowed variables
...
[CL 2467803 by Marc Audy in Main branch]
2015-03-03 12:30:55 -05:00
Phillip Kavan
23c422eae6
[UE-10016] Fix BP merge tool crash when attempting to view component diffs.
...
change summary:
- switched the SCSViews array type to be a TSharedRef<FSCSDiff> in SMergeTreeView; previously the FSCSDiff instance was passed to TArray::Push() as a temporary, which i think didn't increment the refcount of FSCSDiff's internal widget ptrs on the shallow copy to the new element.
[CL 2454047 by Phillip Kavan in Main branch]
2015-02-20 17:26:02 -05:00
Dan Oconnor
05180403e2
Fix for behavior that I can only explain via this compiler bug (or something similar)
...
- https://connect.microsoft.com/VisualStudio/feedback/details/800364/initializer-list-calls-object-destructor-twice
Also fixed possible infinite loop
[CL 2398375 by Dan Oconnor in Main branch]
2015-01-05 22:59:34 -05:00
Dan Oconnor
1ea7d25e62
Diff and merge tool improvements, introduced tree view to display changes, removed the list view that used to display changes made in the blueprint's various graphs
...
[CL 2391959 by Dan Oconnor in Main branch]
2014-12-17 19:27:27 -05:00
Ben Marsh
149375b14b
Update copyright notices to 2015.
...
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Dan Oconnor
d009d03bb8
Leveraging SMyBlueprint and SKismetInspector in the Diff/Merge tools. Rquired introduction of tabs into those tools because we ran out of screenspace
...
#coderview Mike.Beach
[CL 2369322 by Dan Oconnor in Main branch]
2014-11-24 18:59:49 -05:00
Dan Oconnor
5f4d2fe1c8
Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference
...
[CL 2349504 by Dan Oconnor in Main branch]
2014-11-04 22:25:35 -05:00
Dan Oconnor
224bb922af
Merge view for components no longer lists the same difference multiple times
...
[CL 2276187 by Dan Oconnor in Main branch]
2014-08-28 10:43:40 -04:00
Dan Oconnor
1730471006
#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list
...
[CL 2276146
2014-08-28 10:03:31 -04:00
