Merge pull request #792 from thopiekar/master-code-cleanup

[master] code cleanup
This commit is contained in:
Ghostkeeper 2016-06-13 00:41:54 +02:00 committed by GitHub
commit d4f59b0086
2 changed files with 3 additions and 4 deletions

View File

@ -199,7 +199,6 @@ class BuildVolume(SceneNode):
disallowed_areas = self._active_container_stack.getProperty("machine_disallowed_areas", "value")
areas = []
skirt_size = 0.0
skirt_size = self._getSkirtSize(self._active_container_stack)
if disallowed_areas:

View File

@ -51,8 +51,8 @@ class SettingOverrideDecorator(SceneNodeDecorator):
def getActiveExtruder(self):
return self._extruder_stack
def _onSettingChanged(self, instance, property):
if property == "value": # Only reslice if the value has changed.
def _onSettingChanged(self, instance, property_name): # Reminder: 'property' is a built-in function
if property_name == "value": # Only reslice if the value has changed.
Application.getInstance().getBackend().forceSlice()
## Makes sure that the stack upon which the container stack is placed is
@ -78,4 +78,4 @@ class SettingOverrideDecorator(SceneNodeDecorator):
self.activeExtruderChanged.emit()
def getStack(self):
return self._stack
return self._stack