[Bf-blender-cvs] [ea3ee04fa8b] temp-geometry-nodes-fields-prototype: Merge branch 'master' into temp-geometry-nodes-fields-prototype

[Jacques Lucke]

Commit: ea3ee04fa8ba4613007bfbed2206b9af9d3aaddd
Author: Jacques Lucke
Date:   Fri Aug 20 12:42:11 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBea3ee04fa8ba4613007bfbed2206b9af9d3aaddd

Merge branch 'master' into temp-geometry-nodes-fields-prototype

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index bb8db65f4a0,6f9b222571c..cf9b66cf35b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -482,10 -491,11 +482,11 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeAttributeRemove"),
          NodeItem("GeometryNodeAttributeMapRange"),
          NodeItem("GeometryNodeAttributeTransfer"),
 +        NodeItem("GeometryNodeAttributeExtract"),
 +        NodeItem("GeometryNodeAttributeFreeze"),
      ]),
      GeometryNodeCategory("GEO_COLOR", "Color", items=[
+         NodeItem("ShaderNodeMixRGB"),
          NodeItem("ShaderNodeRGBCurve"),
          NodeItem("ShaderNodeValToRGB"),
          NodeItem("ShaderNodeSeparateRGB"),