3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge mistakes

Browse source 
CURA-2299
This commit is contained in:
fieldOfView 2016-09-19 18:30:23 +02:00
parent 087ad6f472
commit 4911eaed00
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/LayerView/LayerView.py
View file

@ -71,6 +71,7 @@ class LayerView(View):
def getActivity(self): def getActivity(self):
return self._activity return self._activity
def getLayerPass(self): def getLayerPass(self):
if not self._layer_pass: if not self._layer_pass:
# Currently the RenderPass constructor requires a size > 0 # Currently the RenderPass constructor requires a size > 0
@ -91,9 +92,6 @@ class LayerView(View):
busyChanged = Signal() busyChanged = Signal()
def getActivity(self):
return self._activity
def isBusy(self): def isBusy(self):
return self._busy return self._busy
@ -194,10 +192,6 @@ class LayerView(View):
Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
self._onGlobalStackChanged() self._onGlobalStackChanged()
if event.type == Event.ViewActivateEvent:
# Make sure the LayerPass is created
self.getLayerPass()
if not self._layerview_composite_shader: if not self._layerview_composite_shader:
self._layerview_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("LayerView"), "layerview_composite.shader")) self._layerview_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("LayerView"), "layerview_composite.shader"))
@ -217,6 +211,7 @@ class LayerView(View):
self._composite_pass.setLayerBindings(self._old_layer_bindings) self._composite_pass.setLayerBindings(self._old_layer_bindings)
self._composite_pass.setCompositeShader(self._old_composite_shader) self._composite_pass.setCompositeShader(self._old_composite_shader)
def _onGlobalStackChanged(self): def _onGlobalStackChanged(self):
if self._global_container_stack: if self._global_container_stack:
self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged)
@ -234,7 +229,6 @@ class LayerView(View):
else: else:
self._wireprint_warning_message.hide() self._wireprint_warning_message.hide()
def _startUpdateTopLayers(self): def _startUpdateTopLayers(self):
if self._top_layers_job: if self._top_layers_job:
self._top_layers_job.finished.disconnect(self._updateCurrentLayerMesh) self._top_layers_job.finished.disconnect(self._updateCurrentLayerMesh)