Merge pull request #805 from thopiekar/master-using-platform

Differencing between Platform from UM.* and UM.Scene.*
This commit is contained in:
Thomas Karl Pietrowski 2016-06-15 16:04:32 +02:00 committed by GitHub
commit 38eec41162

View File

@ -4,7 +4,7 @@
from UM.Qt.QtApplication import QtApplication from UM.Qt.QtApplication import QtApplication
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from UM.Scene.Camera import Camera from UM.Scene.Camera import Camera
from UM.Scene.Platform import Platform from UM.Scene.Platform import Platform as Scene_Platform
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Math.Quaternion import Quaternion from UM.Math.Quaternion import Quaternion
from UM.Math.AxisAlignedBox import AxisAlignedBox from UM.Math.AxisAlignedBox import AxisAlignedBox
@ -341,7 +341,7 @@ class CuraApplication(QtApplication):
Selection.selectionChanged.connect(self.onSelectionChanged) Selection.selectionChanged.connect(self.onSelectionChanged)
root = controller.getScene().getRoot() root = controller.getScene().getRoot()
self._platform = Platform(root) self._platform = Scene_Platform(root)
self._volume = BuildVolume.BuildVolume(root) self._volume = BuildVolume.BuildVolume(root)