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

Merge branch 'master' into feature-backup-manager

Browse source
This commit is contained in:
ChrisTerBeke 2018-05-23 11:07:02 +02:00
commit 41aa31cb2d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PlatformPhysics.py
View file

@ -36,7 +36,7 @@ class PlatformPhysics:
self._max_overlap_checks = 10 # How many times should we try to find a new spot per tick? self._max_overlap_checks = 10 # How many times should we try to find a new spot per tick?
self._minimum_gap = 2 # It is a minimum distance (in mm) between two models, applicable for small models self._minimum_gap = 2 # It is a minimum distance (in mm) between two models, applicable for small models
Preferences.getInstance().addPreference("physics/automatic_push_free", True) Preferences.getInstance().addPreference("physics/automatic_push_free", False)
Preferences.getInstance().addPreference("physics/automatic_drop_down", True) Preferences.getInstance().addPreference("physics/automatic_drop_down", True)
def _onSceneChanged(self, source): def _onSceneChanged(self, source):

4
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -514,7 +514,7 @@ class XmlMaterialProfile(InstanceContainer):
color = entry.find("./um:color", self.__namespaces) color = entry.find("./um:color", self.__namespaces)
label = entry.find("./um:label", self.__namespaces) label = entry.find("./um:label", self.__namespaces)
if label is not None: if label is not None and label.text is not None:
meta_data["name"] = label.text meta_data["name"] = label.text
else: else:
meta_data["name"] = self._profile_name(material.text, color.text) meta_data["name"] = self._profile_name(material.text, color.text)
@ -805,7 +805,7 @@ class XmlMaterialProfile(InstanceContainer):
color = entry.find("./um:color", cls.__namespaces) color = entry.find("./um:color", cls.__namespaces)
label = entry.find("./um:label", cls.__namespaces) label = entry.find("./um:label", cls.__namespaces)
if label is not None: if label is not None and label.text is not None:
base_metadata["name"] = label.text base_metadata["name"] = label.text
else: else:
base_metadata["name"] = cls._profile_name(material.text, color.text) base_metadata["name"] = cls._profile_name(material.text, color.text)