Fix merge conflicts with master

This commit is contained in:
ChrisTerBeke 2018-01-16 09:11:30 +01:00
commit d19b2fb8d9
22 changed files with 135 additions and 108 deletions

View file

@ -423,7 +423,7 @@ class CuraEngineBackend(QObject, Backend):
#
# \param source The scene node that was changed.
def _onSceneChanged(self, source):
if not issubclass(type(source), SceneNode):
if not isinstance(source, SceneNode):
return
build_plate_changed = set()