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

Fix LN replacement and take arm_watch and arm_logic_id properties into account

Browse source
This commit is contained in:
Moritz Brückner 2021-07-24 20:24:04 +02:00
parent 6050bceaf1
commit 6d2b825dd5
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
blender/arm/logicnode/replacement.py
View file

@ -129,15 +129,11 @@ def replace(tree: bpy.types.NodeTree, node: 'ArmLogicTreeNode'):
if isinstance(response, arm_nodes.ArmLogicTreeNode): if isinstance(response, arm_nodes.ArmLogicTreeNode):
newnode = response newnode = response
# some misc. properties # some misc. properties
newnode.parent = node.parent copy_basic_node_props(from_node=node, to_node=newnode)
newnode.location = node.location
newnode.select = node.select
elif isinstance(response, list): # a list of nodes: elif isinstance(response, list): # a list of nodes:
for newnode in response: for newnode in response:
newnode.parent = node.parent copy_basic_node_props(from_node=node, to_node=newnode)
newnode.location = node.location
newnode.select = node.select
elif isinstance(response, NodeReplacement): elif isinstance(response, NodeReplacement):
replacement = response replacement = response
@ -152,9 +148,7 @@ def replace(tree: bpy.types.NodeTree, node: 'ArmLogicTreeNode'):
raise LookupError("The provided NodeReplacement doesn't seem to correspond to the node needing replacement") raise LookupError("The provided NodeReplacement doesn't seem to correspond to the node needing replacement")
# some misc. properties # some misc. properties
newnode.parent = node.parent copy_basic_node_props(from_node=node, to_node=newnode)
newnode.location = node.location
newnode.select = node.select
# now, use the `replacement` to hook up the new node correctly # now, use the `replacement` to hook up the new node correctly
# start by applying defaults # start by applying defaults
@ -276,6 +270,15 @@ def replace_all():
bpy.ops.arm.show_node_update_errors() bpy.ops.arm.show_node_update_errors()
def copy_basic_node_props(from_node: bpy.types.Node, to_node: bpy.types.Node):
to_node.parent = from_node.parent
to_node.location = from_node.location
to_node.select = from_node.select
to_node.arm_logic_id = from_node.arm_logic_id
to_node.arm_watch = from_node.arm_watch
def node_compat_sdk2108(): def node_compat_sdk2108():
"""SDK 21.08 broke compatibility with older nodes as nodes now use """SDK 21.08 broke compatibility with older nodes as nodes now use
custom sockets even for Blender's default data types and custom custom sockets even for Blender's default data types and custom
@ -298,10 +301,7 @@ def node_compat_sdk2108():
continue continue
newnode = tree.nodes.new(node.__class__.bl_idname) newnode = tree.nodes.new(node.__class__.bl_idname)
copy_basic_node_props(from_node=node, to_node=newnode)
newnode.parent = node.parent
newnode.location = node.location
newnode.select = node.select
# Also copy the node's version number to _not_ prevent actual node # Also copy the node's version number to _not_ prevent actual node
# replacement after this step # replacement after this step

2
blender/arm/nodes_logic.py
View file

@ -354,7 +354,7 @@ class ReplaceNodesOperator(bpy.types.Operator):
bl_description = "Replace deprecated nodes" bl_description = "Replace deprecated nodes"
def execute(self, context): def execute(self, context):
arm.logicnode.replacement.replace_all(force_replacement=True) arm.logicnode.replacement.replace_all()
return {'FINISHED'} return {'FINISHED'}
@classmethod @classmethod