[Bf-blender-cvs] [97c0158cdae] geometry-nodes-attribute-nodes: Merge branch 'geometry-nodes' into geometry-nodes-attribute-nodes

[Hans Goudey]

Commit: 97c0158cdae4641bc12b12dfa01c62374f40aa46
Author: Hans Goudey
Date:   Sat Oct 31 00:37:41 2020 -0500
Branches: geometry-nodes-attribute-nodes
https://developer.blender.org/rB97c0158cdae4641bc12b12dfa01c62374f40aa46

Merge branch 'geometry-nodes' into geometry-nodes-attribute-nodes

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 540758cfd8a,7f661da3774..743489c2358
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -490,14 -490,8 +490,13 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeTransform"),
          NodeItem("GeometryNodeBoolean"),
-         NodeItem("GeometryNodePointDistribute"),
 -    ]),    
 +    ]),
 +    GeometryNodeCategory("GEO_ATTRIBUTES", "Attributes", items=[
 +        NodeItem("GeometryNodeCreateAttribute"),
 +        NodeItem("GeometryNodeRandomAttribute"),
 +        NodeItem("GeometryNodeAttributeMath"),
 +    ]),
-     GeometryNodeCategory("GEO_POINTCLOUD", "Pointcloud", items=[
+     GeometryNodeCategory("GEO_SCATTERING", "Scattering", items=[
          NodeItem("GeometryNodePointDistribute"),
          NodeItem("GeometryNodePointInstance"),
      ]),