[Bf-blender-cvs] [243b5ac98cd] temp-attribute-processor: add initial Set Attribute node

[Jacques Lucke]

Commit: 243b5ac98cd02dd4a0be63fcaaf32516eae16c10
Author: Jacques Lucke
Date:   Wed Jun 9 11:19:05 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB243b5ac98cd02dd4a0be63fcaaf32516eae16c10

add initial Set Attribute node

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

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.cc
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/NOD_geometry.h
M	source/blender/nodes/NOD_static_types.h
A	source/blender/nodes/geometry/nodes/node_attr_set_attribute.cc

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index bb823d47b6e..e59dccc5c41 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -617,6 +617,9 @@ attribute_node_categories = [
         NodeItem("FunctionNodeInputVector"),
         NodeItem("AttributeNodeIndex"),
     ]),
+    AttributeNodeCategory("ATTR_OUTPUT", "Output", items=[
+        NodeItem("AttributeNodeSetAttribute"),
+    ]),
     AttributeNodeCategory("ATTR_UTILITIES", "Utilities", items=[
         NodeItem("ShaderNodeMapRange"),
         NodeItem("ShaderNodeClamp"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 31549351792..3e05621b8ef 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1454,6 +1454,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
  * \{ */
 
 #define ATTR_NODE_INDEX 1400
+#define ATTR_NODE_SET_ATTRIBUTE 1401
 
 /** \} */
 
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 6d58821ffae..2ed24f816a6 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5121,6 +5121,7 @@ static void registerGeometryNodes()
   register_node_type_attr_group();
 
   register_node_type_attr_index();
+  register_node_type_attr_set_attribute();
 }
 
 static void registerFunctionNodes()
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index cce6327c8f6..a5bc588f2a4 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -141,6 +141,7 @@ set(SRC
 
   geometry/nodes/node_attr_group.cc
   geometry/nodes/node_attr_index.cc
+  geometry/nodes/node_attr_set_attribute.cc
   geometry/nodes/node_geo_align_rotation_to_vector.cc
   geometry/nodes/node_geo_attribute_clamp.cc
   geometry/nodes/node_geo_attribute_color_ramp.cc
@@ -165,7 +166,7 @@ set(SRC
   geometry/nodes/node_geo_bounding_box.cc
   geometry/nodes/node_geo_collection_info.cc
   geometry/nodes/node_geo_common.cc
-  geometry/nodes/node_geo_curve_length.cc  
+  geometry/nodes/node_geo_curve_length.cc
   geometry/nodes/node_geo_curve_to_mesh.cc
   geometry/nodes/node_geo_curve_resample.cc
   geometry/nodes/node_geo_delete_geometry.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 43688d5ccc6..51445418b92 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -94,6 +94,7 @@ void register_node_type_attr_group(void);
 void register_node_type_attribute_custom_group(bNodeType *ntype);
 
 void register_node_type_attr_index(void);
+void register_node_type_attr_set_attribute(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 13a9fc40111..2fd4a586f48 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -326,6 +326,7 @@ DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE",
 DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
 
 DefNode(AttributeNode, ATTR_NODE_INDEX, 0, "INDEX", Index, "Index", "")
+DefNode(AttributeNode, ATTR_NODE_SET_ATTRIBUTE, 0, "SET_ATTRIBUTE", SetAttribute, "Set Attribute", "")
 
 /* undefine macros */
 #undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_attr_set_attribute.cc b/source/blender/nodes/geometry/nodes/node_attr_set_attribute.cc
new file mode 100644
index 00000000000..8f35da3a712
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_attr_set_attribute.cc
@@ -0,0 +1,38 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "node_geometry_util.hh"
+
+static bNodeSocketTemplate attr_node_set_attribute_in[] = {
+    {SOCK_FLOAT, N_("Value"), 0.0, 0.0, 0.0, 0.0, -FLT_MAX, FLT_MAX},
+    {SOCK_INT, N_("Value"), 0, 0, 0, 0, -100000, 100000},
+    {SOCK_BOOLEAN, N_("Value")},
+    {SOCK_VECTOR, N_("Value"), 0.0, 0.0, 0.0, 0.0, -FLT_MAX, FLT_MAX},
+    {SOCK_RGBA, N_("Value"), 0.8, 0.8, 0.8, 1.0},
+    {-1, ""},
+};
+
+void register_node_type_attr_set_attribute()
+{
+  static bNodeType ntype;
+
+  attr_node_type_base(&ntype, ATTR_NODE_SET_ATTRIBUTE, "Set Attribute", NODE_CLASS_OUTPUT, 0);
+  node_type_socket_templates(&ntype, attr_node_set_attribute_in, nullptr);
+  nodeRegisterType(&ntype);
+}