[Bf-blender-cvs] [1da326f2371] temp-geometry-nodes-processor-prototype: Fix, add the ability to add a "processor" group

Hans Goudey noreply at git.blender.org
Wed Mar 24 23:09:53 CET 2021


Commit: 1da326f2371ce718320c6cbef8aa2be5b86857c8
Author: Hans Goudey
Date:   Wed Mar 24 18:09:47 2021 -0400
Branches: temp-geometry-nodes-processor-prototype
https://developer.blender.org/rB1da326f2371ce718320c6cbef8aa2be5b86857c8

Fix, add the ability to add a "processor" group

It is broken and doesn't do anything yet

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

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/blenkernel/intern/node.cc
M	source/blender/nodes/function/nodes/node_function_common.cc

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index febb31af188..cc3964262e9 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -495,6 +495,7 @@ geometry_node_categories = [
         NodeItem("GeometryNodeAttributeCombineXYZ"),
         NodeItem("GeometryNodeAttributeSeparateXYZ"),
         NodeItem("GeometryNodeAttributeRemove"),
+        NodeItem("FunctionNodeGroup"),
     ]),
     GeometryNodeCategory("GEO_COLOR", "Color", items=[
         NodeItem("ShaderNodeValToRGB"),
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index b1dea8f2814..357ee0c33cb 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4969,6 +4969,7 @@ void BKE_node_system_init(void)
   register_node_tree_type_sh();
   register_node_tree_type_tex();
   register_node_tree_type_geo();
+  register_node_tree_type_function();
 
   register_node_type_frame();
   register_node_type_reroute();
diff --git a/source/blender/nodes/function/nodes/node_function_common.cc b/source/blender/nodes/function/nodes/node_function_common.cc
index b9734f9e36c..7afd8bdac8d 100644
--- a/source/blender/nodes/function/nodes/node_function_common.cc
+++ b/source/blender/nodes/function/nodes/node_function_common.cc
@@ -26,7 +26,8 @@ void register_node_type_function_group(void)
 {
   static bNodeType ntype;
 
-  node_type_base_custom(&ntype, "FunctionNodeGroup", "Group", NODE_CLASS_GROUP, 0);
+  node_type_base_custom(
+      &ntype, "FunctionNodeGroup", "Attribute Processor", NODE_CLASS_ATTRIBUTE, 0);
   ntype.type = NODE_GROUP;
   ntype.poll = fn_node_poll_default;
   ntype.poll_instance = node_group_poll_instance;



More information about the Bf-blender-cvs mailing list