[Bf-blender-cvs] [e606316ed6f] functions: rename refresh to sync_tree

Jacques Lucke noreply at git.blender.org
Thu Aug 1 18:23:20 CEST 2019


Commit: e606316ed6ffa09e45b05f41f07a9ef532ab181b
Author: Jacques Lucke
Date:   Thu Aug 1 14:55:55 2019 +0200
Branches: functions
https://developer.blender.org/rBe606316ed6ffa09e45b05f41f07a9ef532ab181b

rename refresh to sync_tree

===================================================================

M	release/scripts/startup/nodes/base.py
M	release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
M	release/scripts/startup/nodes/declaration/pack_list.py
M	release/scripts/startup/nodes/declaration/variadic.py
M	release/scripts/startup/nodes/function_nodes/call.py
M	release/scripts/startup/nodes/function_nodes/compare.py
M	release/scripts/startup/nodes/function_nodes/float_math.py
M	release/scripts/startup/nodes/function_nodes/list.py
M	release/scripts/startup/nodes/function_nodes/switch.py
M	release/scripts/startup/nodes/function_nodes/vector.py
M	release/scripts/startup/nodes/node_operators.py

===================================================================

diff --git a/release/scripts/startup/nodes/base.py b/release/scripts/startup/nodes/base.py
index a1f94330b17..c58de89a276 100644
--- a/release/scripts/startup/nodes/base.py
+++ b/release/scripts/startup/nodes/base.py
@@ -12,6 +12,9 @@ class BaseTree:
             self.links.new(b, a)
 
     def update(self):
+        self.sync()
+
+    def sync(self):
         from . sync import sync_trees_and_dependent_trees
         sync_trees_and_dependent_trees({self})
 
@@ -55,10 +58,8 @@ class BaseNode:
             yield (cls.bl_label, dict())
         yield from cls.search_terms
 
-    def refresh(self, context=None):
-        from . sync import sync_trees_and_dependent_trees
-        sync_trees_and_dependent_trees({self.tree})
-        pass
+    def sync_tree(self, context=None):
+        self.tree.sync()
 
     def rebuild(self):
         from . sync import skip_syncing
diff --git a/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py b/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
index 40823439d18..9c5d950b815 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/custom_emitter.py
@@ -11,7 +11,7 @@ class CustomEmitterNode(bpy.types.Node, FunctionNode):
     function_tree: PointerProperty(
         name="Function Tree",
         type=bpy.types.NodeTree,
-        update=FunctionNode.refresh,
+        update=FunctionNode.sync_tree,
     )
 
     def declaration(self, builder: NodeBuilder):
diff --git a/release/scripts/startup/nodes/declaration/pack_list.py b/release/scripts/startup/nodes/declaration/pack_list.py
index 15f6b0baf57..908bda99683 100644
--- a/release/scripts/startup/nodes/declaration/pack_list.py
+++ b/release/scripts/startup/nodes/declaration/pack_list.py
@@ -132,8 +132,7 @@ class NewPackListInputOperator(bpy.types.Operator):
         item.state = "BASE"
         item.identifier_prefix = str(uuid.uuid4())
 
-        node.refresh()
-
+        tree.sync()
         return {'FINISHED'}
 
 class RemovePackListInputOperator(bpy.types.Operator):
@@ -151,5 +150,5 @@ class RemovePackListInputOperator(bpy.types.Operator):
         node = tree.nodes[self.node_name]
         collection = getattr(node, self.prop_name)
         collection.remove(self.index)
-        node.refresh()
+        tree.sync()
         return {'FINISHED'}
diff --git a/release/scripts/startup/nodes/declaration/variadic.py b/release/scripts/startup/nodes/declaration/variadic.py
index d5ed8500ac7..be889b9104c 100644
--- a/release/scripts/startup/nodes/declaration/variadic.py
+++ b/release/scripts/startup/nodes/declaration/variadic.py
@@ -85,7 +85,7 @@ class AnyVariadicDecl(SocketDeclBase):
         item.data_type = data_type
         item.display_name = display_name
         item.identifier_prefix = str(uuid.uuid4())
-        self.node.refresh()
+        self.node.sync_tree()
         return item
 
     @classmethod
@@ -127,7 +127,7 @@ class AppendAnyVariadicOperator(bpy.types.Operator):
         item.display_name = data_type
         item.identifier_prefix = str(uuid.uuid4())
 
-        node.refresh()
+        tree.sync()
         return {'FINISHED'}
 
 class RemoveAnyVariadicOperator(bpy.types.Operator):
@@ -145,5 +145,5 @@ class RemoveAnyVariadicOperator(bpy.types.Operator):
         node = tree.nodes[self.node_name]
         collection = getattr(node, self.prop_name)
         collection.remove(self.index)
-        node.refresh()
+        tree.sync()
         return {'FINISHED'}
diff --git a/release/scripts/startup/nodes/function_nodes/call.py b/release/scripts/startup/nodes/function_nodes/call.py
index 9efb3f71218..6b24d646a47 100644
--- a/release/scripts/startup/nodes/function_nodes/call.py
+++ b/release/scripts/startup/nodes/function_nodes/call.py
@@ -9,7 +9,7 @@ class CallNode(bpy.types.Node, FunctionNode):
     function_tree: PointerProperty(
         name="Function Tree",
         type=bpy.types.NodeTree,
-        update=FunctionNode.refresh,
+        update=FunctionNode.sync_tree,
     )
 
     def declaration(self, builder):
diff --git a/release/scripts/startup/nodes/function_nodes/compare.py b/release/scripts/startup/nodes/function_nodes/compare.py
index 36a80342d09..d368d800364 100644
--- a/release/scripts/startup/nodes/function_nodes/compare.py
+++ b/release/scripts/startup/nodes/function_nodes/compare.py
@@ -18,7 +18,7 @@ class CompareNode(bpy.types.Node, FunctionNode):
     operation: EnumProperty(
         name="Operation",
         items=operation_items,
-        update=FunctionNode.refresh,
+        update=FunctionNode.sync_tree,
     )
 
     use_list__a: NodeBuilder.VectorizedProperty()
diff --git a/release/scripts/startup/nodes/function_nodes/float_math.py b/release/scripts/startup/nodes/function_nodes/float_math.py
index 4967860873c..f3d597f58ff 100644
--- a/release/scripts/startup/nodes/function_nodes/float_math.py
+++ b/release/scripts/startup/nodes/function_nodes/float_math.py
@@ -27,7 +27,7 @@ class FloatMathNode(bpy.types.Node, FunctionNode):
     operation: EnumProperty(
         name="Operation",
         items=operation_items,
-        update=FunctionNode.refresh,
+        update=FunctionNode.sync_tree,
     )
 
     use_list__a: NodeBuilder.VectorizedProperty()
diff --git a/release/scripts/startup/nodes/function_nodes/list.py b/release/scripts/startup/nodes/function_nodes/list.py
index 5fb1b057126..26991fb6119 100644
--- a/release/scripts/startup/nodes/function_nodes/list.py
+++ b/release/scripts/startup/nodes/function_nodes/list.py
@@ -35,7 +35,7 @@ class PackListNode(bpy.types.Node, FunctionNode):
 
     active_type: StringProperty(
         default="Float",
-        update=FunctionNode.refresh)
+        update=FunctionNode.sync_tree)
 
     variadic: NodeBuilder.PackListProperty()
 
diff --git a/release/scripts/startup/nodes/function_nodes/switch.py b/release/scripts/startup/nodes/function_nodes/switch.py
index 99ebcd6970f..2d7ed4d6382 100644
--- a/release/scripts/startup/nodes/function_nodes/switch.py
+++ b/release/scripts/startup/nodes/function_nodes/switch.py
@@ -8,7 +8,7 @@ class SwitchNode(bpy.types.Node, FunctionNode):
 
     data_type: StringProperty(
         default="Float",
-        update=FunctionNode.refresh
+        update=FunctionNode.sync_tree
     )
 
     def declaration(self, builder):
diff --git a/release/scripts/startup/nodes/function_nodes/vector.py b/release/scripts/startup/nodes/function_nodes/vector.py
index 5ee01fe4700..4f7d7f1cda4 100644
--- a/release/scripts/startup/nodes/function_nodes/vector.py
+++ b/release/scripts/startup/nodes/function_nodes/vector.py
@@ -15,7 +15,7 @@ class VectorMathNode(bpy.types.Node, FunctionNode):
     operation: EnumProperty(
         name="Operation",
         items=operation_items,
-        update=FunctionNode.refresh,
+        update=FunctionNode.sync_tree,
     )
 
     use_list__a: NodeBuilder.VectorizedProperty()
diff --git a/release/scripts/startup/nodes/node_operators.py b/release/scripts/startup/nodes/node_operators.py
index 8e8401c3e65..5528ab3abbd 100644
--- a/release/scripts/startup/nodes/node_operators.py
+++ b/release/scripts/startup/nodes/node_operators.py
@@ -91,7 +91,6 @@ def new_function_tree(name, inputs, outputs):
         variadic = input_node.outputs[0].get_decl(input_node)
         for data_type, name in inputs:
             variadic.add_item(data_type, name)
-        input_node.refresh()
         return input_node
 
     def create_output(tree):
@@ -99,7 +98,6 @@ def new_function_tree(name, inputs, outputs):
         variadic = output_node.inputs[0].get_decl(output_node)
         for data_type, name in outputs:
             variadic.add_item(data_type, name)
-        output_node.refresh()
         return output_node
 
     tree = bpy.data.node_groups.new(name, "FunctionTree")
@@ -107,4 +105,5 @@ def new_function_tree(name, inputs, outputs):
     output_node = create_output(tree)
     input_node.location.x = -200 - input_node.width
     output_node.location.x = 200
+    tree.sync()
     return tree



More information about the Bf-blender-cvs mailing list