From b386bda2c86fe08127cce7190919a3e85a819cf8 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 18 Sep 2017 15:38:31 +0200 Subject: [PATCH] more fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46 --- plugins/3MFReader/ThreeMFReader.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 2173afb2cc..93a8dc1c65 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -73,18 +73,10 @@ class ThreeMFReader(MeshReader): return temp_mat - - ## Convenience function that converts a SceneNode object (as obtained from libSavitar) to a Uranium scenenode. - # \returns Uranium Scenen node. + ## Convenience function that converts a SceneNode object (as obtained from libSavitar) to a Uranium scene node. + # \returns Uranium scene node. def _convertSavitarNodeToUMNode(self, savitar_node): um_node = SceneNode() -<<<<<<< HEAD - - # Disable the auto-drop feature when loading a project file and processing the nodes for the first time - um_node.setSetting("auto_drop", False) - -======= ->>>>>>> parent of 11ebdf73... CURA-4269 disable auto-drop for first time loaded models from project files transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation()) um_node.setTransformation(transformation) mesh_builder = MeshBuilder()