mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
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:
commit
e5df4c4c5e
1 changed files with 1 additions and 1 deletions
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue