diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 1a5d6ef837..b22552d8c5 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -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._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) def _onSceneChanged(self, source): diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 6dcd5a5ccc..70d07c1fc5 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -514,7 +514,7 @@ class XmlMaterialProfile(InstanceContainer): color = entry.find("./um:color", 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 else: meta_data["name"] = self._profile_name(material.text, color.text) @@ -805,7 +805,7 @@ class XmlMaterialProfile(InstanceContainer): color = entry.find("./um:color", 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 else: base_metadata["name"] = cls._profile_name(material.text, color.text)