3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 11:51:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge branch 'master' into libArachne_rebased

Browse source 
Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.
This commit is contained in:
Ghostkeeper 2021-06-30 16:46:19 +02:00
commit 88954922d4
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
484 changed files with 32262 additions and 2638 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -708,6 +708,8 @@ class CuraApplication(QtApplication):
@pyqtSlot(str)
def discardOrKeepProfileChangesClosed(self, option: str) -> None:
global_stack = self.getGlobalContainerStack()
if global_stack is None:
return
if option == "discard":
for extruder in global_stack.extruderList:
extruder.userChanges.clear()