From ffee6dc521138fa25f8e896dc6765527dc56f1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Br=C3=BCckner?= Date: Sun, 25 Jul 2021 17:02:29 +0200 Subject: [PATCH] Fix error caused by resolving merge conflict --- blender/arm/handlers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blender/arm/handlers.py b/blender/arm/handlers.py index 24786a07..f3d03f42 100644 --- a/blender/arm/handlers.py +++ b/blender/arm/handlers.py @@ -10,6 +10,7 @@ import arm.api import arm.live_patch as live_patch import arm.logicnode.arm_nodes as arm_nodes import arm.nodes_logic +import arm.make as make import arm.make_state as state import arm.props as props import arm.utils @@ -103,7 +104,7 @@ def always() -> float: space.node_tree.arm_cached = False return 0.5 - + def poll_threads() -> float: """Polls the thread callback queue and if a thread has finished, it is joined with the main thread and the corresponding callback is @@ -120,7 +121,7 @@ def poll_threads() -> float: # Quickly check if another thread has finished return 0.01 - + appended_py_paths = [] context_screen = None