Merge branch 'master' into mypy_fixes

Contributes to CURA-5330
This commit is contained in:
Diego Prado Gesto 2018-06-08 15:29:22 +02:00
commit e5e96bc600
98 changed files with 19713 additions and 16495 deletions

View file

@ -20,7 +20,7 @@ class CuraSceneNode(SceneNode):
def __init__(self, parent: Optional["SceneNode"] = None, visible: bool = True, name: str = "", no_setting_override: bool = False) -> None:
super().__init__(parent = parent, visible = visible, name = name)
if not no_setting_override:
self.addDecorator(SettingOverrideDecorator())
self.addDecorator(SettingOverrideDecorator()) # now we always have a getActiveExtruderPosition, unless explicitly disabled
self._outside_buildarea = False
def setOutsideBuildArea(self, new_value: bool) -> None: