maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix error caused by resolving merge conflict

Browse source
This commit is contained in:
Moritz Brückner 2021-07-25 17:02:29 +02:00
parent cca82a69bf
commit ffee6dc521
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
blender/arm/handlers.py
View file

@ -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