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

Import Application instead of inline import CuraApplication

Browse source 
CURA-4186
This commit is contained in:
Lipu Fei 2017-08-28 14:35:34 +02:00
parent 37414e7bc7
commit b84500f742
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Settings/PerObjectContainerStack.py
View file

@ -1,5 +1,6 @@
from typing import Any, Optional
from UM.Application import Application
from UM.Decorators import override
from UM.Settings.Interfaces import PropertyEvaluationContext
from UM.Settings.ContainerStack import ContainerStack
@ -14,9 +15,7 @@ class PerObjectContainerStack(ContainerStack):
context = PropertyEvaluationContext()
context.pushContainer(self)
# this import has to be here otherwise there will be a circular import loop
from cura.CuraApplication import CuraApplication
global_stack = CuraApplication.getInstance().getGlobalContainerStack()
global_stack = Application.getInstance().getGlobalContainerStack()
# Return the user defined value if present, otherwise, evaluate the value according to the default routine.
if self.getContainer(0).hasProperty(key, property_name):