Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

This commit is contained in:
Tamara Hogenhout 2015-09-22 15:32:15 +02:00
commit e1c113a81a
3 changed files with 14 additions and 6 deletions

View file

@ -529,6 +529,8 @@ class CuraApplication(QtApplication):
op = AddSceneNodeOperation(node, self.getController().getScene().getRoot()) op = AddSceneNodeOperation(node, self.getController().getScene().getRoot())
op.push() op.push()
self.getController().getScene().sceneChanged.emit(node) #Force scene change.
def _onJobFinished(self, job): def _onJobFinished(self, job):
if type(job) is not ReadMeshJob or not job.getResult(): if type(job) is not ReadMeshJob or not job.getResult():
return return

View file

@ -223,10 +223,16 @@ class CuraEngineBackend(Backend):
self._socket.sendMessage(slice_message) self._socket.sendMessage(slice_message)
def _onSceneChanged(self, source): def _onSceneChanged(self, source):
if (type(source) is not SceneNode) or (source is self._scene.getRoot()) or (source.getMeshData() is None): if type(source) is not SceneNode:
return return
if(source.getMeshData().getVertices() is None): if source is self._scene.getRoot():
return
if source.getMeshData() is None:
return
if source.getMeshData().getVertices() is None:
return return
self._onChanged() self._onChanged()

View file

@ -43,19 +43,19 @@
"default": [ "default": [
[ [
-40, -40,
30 10
], ],
[ [
-40, -40,
-10 -30
], ],
[ [
60, 60,
-10 10
], ],
[ [
60, 60,
30 -30
] ]
] ]
}, },