mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-13 06:19:02 +08:00
Merge branch '5.7' into CURA-11715-save_as_type-for-3mf
This commit is contained in:
commit
42261b67d7
@ -915,10 +915,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
|||||||
|
|
||||||
# Prepare the machine
|
# Prepare the machine
|
||||||
self._applyChangesToMachine(global_stack, extruder_stack_dict)
|
self._applyChangesToMachine(global_stack, extruder_stack_dict)
|
||||||
else:
|
|
||||||
# Just clear the settings now, so that we can change the active machine without conflicts
|
|
||||||
self._clearMachineSettings(global_stack, {})
|
|
||||||
|
|
||||||
|
|
||||||
Logger.log("d", "Workspace loading is notifying rest of the code of changes...")
|
Logger.log("d", "Workspace loading is notifying rest of the code of changes...")
|
||||||
# Actually change the active machine.
|
# Actually change the active machine.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user