Merge branch '2.6'

* 2.6:
  Merge pull request #1910 from Ultimaker/fix_dialog_sizes
  Fix ordering of merged PlatformPhysicsOperation
This commit is contained in:
Arjen Hiemstra 2017-06-13 13:23:35 +02:00
commit e5df4c4c5e

View File

@ -23,8 +23,8 @@ class PlatformPhysicsOperation(Operation):
def mergeWith(self, other):
group = GroupedOperation()
group.addOperation(self)
group.addOperation(other)
group.addOperation(self)
return group