GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 11:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6'

Browse Source 
* 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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/PlatformPhysicsOperation.py
View File

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