mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 23:53:56 -06:00
Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10
This commit is contained in:
commit
e1c113a81a
3 changed files with 14 additions and 6 deletions
|
@ -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
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -43,19 +43,19 @@
|
||||||
"default": [
|
"default": [
|
||||||
[
|
[
|
||||||
-40,
|
-40,
|
||||||
30
|
10
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
-40,
|
-40,
|
||||||
-10
|
-30
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
60,
|
60,
|
||||||
-10
|
10
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
60,
|
60,
|
||||||
30
|
-30
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue