[Bf-blender-cvs] [d41e65e44cb] functions: rename function_nodes folder to nodes and add bparticles tree type

Jacques Lucke noreply at git.blender.org
Tue Jul 2 16:11:42 CEST 2019


Commit: d41e65e44cbf43820f85c516b3b938334fc748b2
Author: Jacques Lucke
Date:   Tue Jul 2 12:13:16 2019 +0200
Branches: functions
https://developer.blender.org/rBd41e65e44cbf43820f85c516b3b938334fc748b2

rename function_nodes folder to nodes and add bparticles tree type

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

M	release/scripts/startup/bl_operators/modifiers.py
R100	release/scripts/startup/function_nodes/__init__.py	release/scripts/startup/nodes/__init__.py
R100	release/scripts/startup/function_nodes/auto_load.py	release/scripts/startup/nodes/auto_load.py
R100	release/scripts/startup/function_nodes/base.py	release/scripts/startup/nodes/base.py
A	release/scripts/startup/nodes/bparticles_tree.py
R100	release/scripts/startup/function_nodes/declaration/__init__.py	release/scripts/startup/nodes/declaration/__init__.py
R100	release/scripts/startup/function_nodes/declaration/base.py	release/scripts/startup/nodes/declaration/base.py
R100	release/scripts/startup/function_nodes/declaration/dynamic_list.py	release/scripts/startup/nodes/declaration/dynamic_list.py
R100	release/scripts/startup/function_nodes/declaration/fixed_type.py	release/scripts/startup/nodes/declaration/fixed_type.py
R100	release/scripts/startup/function_nodes/declaration/pack_list.py	release/scripts/startup/nodes/declaration/pack_list.py
R100	release/scripts/startup/function_nodes/declaration/tree_interface.py	release/scripts/startup/nodes/declaration/tree_interface.py
R100	release/scripts/startup/function_nodes/declaration/variadic.py	release/scripts/startup/nodes/declaration/variadic.py
R100	release/scripts/startup/function_nodes/declaration/vectorized.py	release/scripts/startup/nodes/declaration/vectorized.py
R100	release/scripts/startup/function_nodes/nodes/__init__.py	release/scripts/startup/nodes/function_nodes/__init__.py
R100	release/scripts/startup/function_nodes/nodes/call.py	release/scripts/startup/nodes/function_nodes/call.py
R100	release/scripts/startup/function_nodes/nodes/clamp.py	release/scripts/startup/nodes/function_nodes/clamp.py
R100	release/scripts/startup/function_nodes/nodes/combine_vector.py	release/scripts/startup/nodes/function_nodes/combine_vector.py
R100	release/scripts/startup/function_nodes/nodes/float_math.py	release/scripts/startup/nodes/function_nodes/float_math.py
R100	release/scripts/startup/function_nodes/nodes/float_range.py	release/scripts/startup/nodes/function_nodes/float_range.py
R100	release/scripts/startup/function_nodes/nodes/function_input.py	release/scripts/startup/nodes/function_nodes/function_input.py
R100	release/scripts/startup/function_nodes/nodes/function_output.py	release/scripts/startup/nodes/function_nodes/function_output.py
R100	release/scripts/startup/function_nodes/nodes/get_list_element.py	release/scripts/startup/nodes/function_nodes/get_list_element.py
R100	release/scripts/startup/function_nodes/nodes/list_length.py	release/scripts/startup/nodes/function_nodes/list_length.py
R100	release/scripts/startup/function_nodes/nodes/map_range.py	release/scripts/startup/nodes/function_nodes/map_range.py
R100	release/scripts/startup/function_nodes/nodes/object_transforms.py	release/scripts/startup/nodes/function_nodes/object_transforms.py
R100	release/scripts/startup/function_nodes/nodes/pack_list.py	release/scripts/startup/nodes/function_nodes/pack_list.py
R100	release/scripts/startup/function_nodes/nodes/random_number.py	release/scripts/startup/nodes/function_nodes/random_number.py
R100	release/scripts/startup/function_nodes/nodes/separate_vector.py	release/scripts/startup/nodes/function_nodes/separate_vector.py
R100	release/scripts/startup/function_nodes/nodes/switch.py	release/scripts/startup/nodes/function_nodes/switch.py
R100	release/scripts/startup/function_nodes/nodes/vector_distance.py	release/scripts/startup/nodes/function_nodes/vector_distance.py
R100	release/scripts/startup/function_nodes/nodes/vector_math.py	release/scripts/startup/nodes/function_nodes/vector_math.py
R100	release/scripts/startup/function_nodes/function_tree.py	release/scripts/startup/nodes/function_tree.py
R100	release/scripts/startup/function_nodes/graph.py	release/scripts/startup/nodes/graph.py
R100	release/scripts/startup/function_nodes/inferencing.py	release/scripts/startup/nodes/inferencing.py
R100	release/scripts/startup/function_nodes/keymap.py	release/scripts/startup/nodes/keymap.py
R100	release/scripts/startup/function_nodes/menu.py	release/scripts/startup/nodes/menu.py
R100	release/scripts/startup/function_nodes/node_operators.py	release/scripts/startup/nodes/node_operators.py
R100	release/scripts/startup/function_nodes/problems.py	release/scripts/startup/nodes/problems.py
R100	release/scripts/startup/function_nodes/search.py	release/scripts/startup/nodes/search.py
R100	release/scripts/startup/function_nodes/socket_builder.py	release/scripts/startup/nodes/socket_builder.py
R100	release/scripts/startup/function_nodes/sockets.py	release/scripts/startup/nodes/sockets.py
R100	release/scripts/startup/function_nodes/sync.py	release/scripts/startup/nodes/sync.py
R100	release/scripts/startup/function_nodes/test_graph.py	release/scripts/startup/nodes/test_graph.py
R100	release/scripts/startup/function_nodes/tests.py	release/scripts/startup/nodes/tests.py
R100	release/scripts/startup/function_nodes/tree_data.py	release/scripts/startup/nodes/tree_data.py
R100	release/scripts/startup/function_nodes/tree_panel.py	release/scripts/startup/nodes/tree_panel.py
R100	release/scripts/startup/function_nodes/types.py	release/scripts/startup/nodes/types.py
R100	release/scripts/startup/function_nodes/types_base.py	release/scripts/startup/nodes/types_base.py
R100	release/scripts/startup/function_nodes/ui.py	release/scripts/startup/nodes/ui.py
R100	release/scripts/startup/function_nodes/utils/generic.py	release/scripts/startup/nodes/utils/generic.py
R100	release/scripts/startup/function_nodes/utils/graph.py	release/scripts/startup/nodes/utils/graph.py
M	source/blender/functions/frontends/data_flow_nodes/builder.cpp

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

diff --git a/release/scripts/startup/bl_operators/modifiers.py b/release/scripts/startup/bl_operators/modifiers.py
index c6009cde396..1f8e47428b6 100644
--- a/release/scripts/startup/bl_operators/modifiers.py
+++ b/release/scripts/startup/bl_operators/modifiers.py
@@ -22,7 +22,7 @@ class NewDeformationFunction(bpy.types.Operator, ModifierOperator):
         if mod is None:
             return {'CANCELLED'}
 
-        from function_nodes.node_operators import new_function_tree
+        from nodes.node_operators import new_function_tree
         tree = new_function_tree("Deformation Function", [
             ("Vector", "Old Position"),
             ("Integer", "Vertex Seed"),
@@ -47,7 +47,7 @@ class NewPointGeneratorFunction(bpy.types.Operator, ModifierOperator):
         if mod is None:
             return {'CANCELLED'}
 
-        from function_nodes.node_operators import new_function_tree
+        from nodes.node_operators import new_function_tree
         tree = new_function_tree("Point Generator", [
             ("Float", "Control 1"),
             ("Integer", "Control 2"),
@@ -61,4 +61,4 @@ class NewPointGeneratorFunction(bpy.types.Operator, ModifierOperator):
 classes = (
     NewDeformationFunction,
     NewPointGeneratorFunction,
-)
\ No newline at end of file
+)
diff --git a/release/scripts/startup/function_nodes/__init__.py b/release/scripts/startup/nodes/__init__.py
similarity index 100%
rename from release/scripts/startup/function_nodes/__init__.py
rename to release/scripts/startup/nodes/__init__.py
diff --git a/release/scripts/startup/function_nodes/auto_load.py b/release/scripts/startup/nodes/auto_load.py
similarity index 100%
rename from release/scripts/startup/function_nodes/auto_load.py
rename to release/scripts/startup/nodes/auto_load.py
diff --git a/release/scripts/startup/function_nodes/base.py b/release/scripts/startup/nodes/base.py
similarity index 100%
rename from release/scripts/startup/function_nodes/base.py
rename to release/scripts/startup/nodes/base.py
diff --git a/release/scripts/startup/nodes/bparticles_tree.py b/release/scripts/startup/nodes/bparticles_tree.py
new file mode 100644
index 00000000000..1f3feb3992b
--- /dev/null
+++ b/release/scripts/startup/nodes/bparticles_tree.py
@@ -0,0 +1,7 @@
+import bpy
+from . base import BaseTree
+
+class BParticlesTree(bpy.types.NodeTree, BaseTree):
+    bl_idname = "BParticlesTree"
+    bl_icon = "PARTICLES"
+    bl_label = "BParticles"
diff --git a/release/scripts/startup/function_nodes/declaration/__init__.py b/release/scripts/startup/nodes/declaration/__init__.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/__init__.py
rename to release/scripts/startup/nodes/declaration/__init__.py
diff --git a/release/scripts/startup/function_nodes/declaration/base.py b/release/scripts/startup/nodes/declaration/base.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/base.py
rename to release/scripts/startup/nodes/declaration/base.py
diff --git a/release/scripts/startup/function_nodes/declaration/dynamic_list.py b/release/scripts/startup/nodes/declaration/dynamic_list.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/dynamic_list.py
rename to release/scripts/startup/nodes/declaration/dynamic_list.py
diff --git a/release/scripts/startup/function_nodes/declaration/fixed_type.py b/release/scripts/startup/nodes/declaration/fixed_type.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/fixed_type.py
rename to release/scripts/startup/nodes/declaration/fixed_type.py
diff --git a/release/scripts/startup/function_nodes/declaration/pack_list.py b/release/scripts/startup/nodes/declaration/pack_list.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/pack_list.py
rename to release/scripts/startup/nodes/declaration/pack_list.py
diff --git a/release/scripts/startup/function_nodes/declaration/tree_interface.py b/release/scripts/startup/nodes/declaration/tree_interface.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/tree_interface.py
rename to release/scripts/startup/nodes/declaration/tree_interface.py
diff --git a/release/scripts/startup/function_nodes/declaration/variadic.py b/release/scripts/startup/nodes/declaration/variadic.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/variadic.py
rename to release/scripts/startup/nodes/declaration/variadic.py
diff --git a/release/scripts/startup/function_nodes/declaration/vectorized.py b/release/scripts/startup/nodes/declaration/vectorized.py
similarity index 100%
rename from release/scripts/startup/function_nodes/declaration/vectorized.py
rename to release/scripts/startup/nodes/declaration/vectorized.py
diff --git a/release/scripts/startup/function_nodes/nodes/__init__.py b/release/scripts/startup/nodes/function_nodes/__init__.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/__init__.py
rename to release/scripts/startup/nodes/function_nodes/__init__.py
diff --git a/release/scripts/startup/function_nodes/nodes/call.py b/release/scripts/startup/nodes/function_nodes/call.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/call.py
rename to release/scripts/startup/nodes/function_nodes/call.py
diff --git a/release/scripts/startup/function_nodes/nodes/clamp.py b/release/scripts/startup/nodes/function_nodes/clamp.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/clamp.py
rename to release/scripts/startup/nodes/function_nodes/clamp.py
diff --git a/release/scripts/startup/function_nodes/nodes/combine_vector.py b/release/scripts/startup/nodes/function_nodes/combine_vector.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/combine_vector.py
rename to release/scripts/startup/nodes/function_nodes/combine_vector.py
diff --git a/release/scripts/startup/function_nodes/nodes/float_math.py b/release/scripts/startup/nodes/function_nodes/float_math.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/float_math.py
rename to release/scripts/startup/nodes/function_nodes/float_math.py
diff --git a/release/scripts/startup/function_nodes/nodes/float_range.py b/release/scripts/startup/nodes/function_nodes/float_range.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/float_range.py
rename to release/scripts/startup/nodes/function_nodes/float_range.py
diff --git a/release/scripts/startup/function_nodes/nodes/function_input.py b/release/scripts/startup/nodes/function_nodes/function_input.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/function_input.py
rename to release/scripts/startup/nodes/function_nodes/function_input.py
diff --git a/release/scripts/startup/function_nodes/nodes/function_output.py b/release/scripts/startup/nodes/function_nodes/function_output.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/function_output.py
rename to release/scripts/startup/nodes/function_nodes/function_output.py
diff --git a/release/scripts/startup/function_nodes/nodes/get_list_element.py b/release/scripts/startup/nodes/function_nodes/get_list_element.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/get_list_element.py
rename to release/scripts/startup/nodes/function_nodes/get_list_element.py
diff --git a/release/scripts/startup/function_nodes/nodes/list_length.py b/release/scripts/startup/nodes/function_nodes/list_length.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/list_length.py
rename to release/scripts/startup/nodes/function_nodes/list_length.py
diff --git a/release/scripts/startup/function_nodes/nodes/map_range.py b/release/scripts/startup/nodes/function_nodes/map_range.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/map_range.py
rename to release/scripts/startup/nodes/function_nodes/map_range.py
diff --git a/release/scripts/startup/function_nodes/nodes/object_transforms.py b/release/scripts/startup/nodes/function_nodes/object_transforms.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/object_transforms.py
rename to release/scripts/startup/nodes/function_nodes/object_transforms.py
diff --git a/release/scripts/startup/function_nodes/nodes/pack_list.py b/release/scripts/startup/nodes/function_nodes/pack_list.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/pack_list.py
rename to release/scripts/startup/nodes/function_nodes/pack_list.py
diff --git a/release/scripts/startup/function_nodes/nodes/random_number.py b/release/scripts/startup/nodes/function_nodes/random_number.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/random_number.py
rename to release/scripts/startup/nodes/function_nodes/random_number.py
diff --git a/release/scripts/startup/function_nodes/nodes/separate_vector.py b/release/scripts/startup/nodes/function_nodes/separate_vector.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/separate_vector.py
rename to release/scripts/startup/nodes/function_nodes/separate_vector.py
diff --git a/release/scripts/startup/function_nodes/nodes/switch.py b/release/scripts/startup/nodes/function_nodes/switch.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/switch.py
rename to release/scripts/startup/nodes/function_nodes/switch.py
diff --git a/release/scripts/startup/function_nodes/nodes/vector_distance.py b/release/scripts/startup/nodes/function_nodes/vector_distance.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/vector_distance.py
rename to release/scripts/startup/nodes/function_nodes/vector_distance.py
diff --git a/release/scripts/startup/function_nodes/nodes/vector_math.py b/release/scripts/startup/nodes/function_nodes/vector_math.py
similarity index 100%
rename from release/scripts/startup/function_nodes/nodes/vector_math.py
rename to release/scripts/startup/nodes/function_nodes/vector_math.py
d

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list