[Bf-blender-cvs] [dcc7786f142] temp-attribute-processor: Merge branch 'master' into temp-attribute-processor

[Jacques Lucke]

Commit: dcc7786f1425742fd058bbd3474c1da4135ea186
Author: Jacques Lucke
Date:   Tue May 25 16:58:15 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rBdcc7786f1425742fd058bbd3474c1da4135ea186

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 05a48707825,4bff18cd1be..b99e9dcdcc3
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -503,9 -493,9 +503,10 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeAttributeRemove"),
          NodeItem("GeometryNodeAttributeMapRange"),
          NodeItem("GeometryNodeAttributeTransfer"),
 +        NodeItem("GeometryNodeAttributeProcessor"),
      ]),
      GeometryNodeCategory("GEO_COLOR", "Color", items=[
+         NodeItem("ShaderNodeRGBCurve"),
          NodeItem("ShaderNodeValToRGB"),
          NodeItem("ShaderNodeSeparateRGB"),
          NodeItem("ShaderNodeCombineRGB"),