3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-10-15 15:00:03 +02:00
commit 0af8bd5e94
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/MaterialManagementModel.py
View file

@ -156,6 +156,8 @@ class MaterialManagementModel(QObject):
new_containers = sorted(new_containers, key = lambda x: x.getId(), reverse = True)
# Optimization. Serving the same purpose as the postponeSignals() in removeMaterial()
# postpone the signals emitted when duplicating materials. This is easier on the event loop; changes the
# behavior to be like a transaction. Prevents concurrency issues.
with postponeSignals(container_registry.containerAdded, compress=CompressTechnique.CompressPerParameterValue):
for container_to_add in new_containers:
container_to_add.setDirty(True)