[Bf-blender-cvs] [3bd111a140e] geometry-nodes-distribute-points: Merge branch 'geometry-nodes' into geometry-nodes-distribute-points

[Sebastian Parborg]

Commit: 3bd111a140e01e65f213d217034763cbe69f2f12
Author: Sebastian Parborg
Date:   Fri Dec 4 15:32:04 2020 +0100
Branches: geometry-nodes-distribute-points
https://developer.blender.org/rB3bd111a140e01e65f213d217034763cbe69f2f12

Merge branch 'geometry-nodes' into geometry-nodes-distribute-points

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



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

diff --cc source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index 2da256209f4,2f5f7e264bc..a182a6f5375
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@@ -322,9 -132,9 +322,10 @@@ void register_node_type_geo_point_distr
  {
    static bNodeType ntype;
  
-   geo_node_type_base(&ntype, GEO_NODE_POINT_DISTRIBUTE, "Point Distribute", 0, 0);
+   geo_node_type_base(
+       &ntype, GEO_NODE_POINT_DISTRIBUTE, "Point Distribute", NODE_CLASS_GEOMETRY, 0);
    node_type_socket_templates(&ntype, geo_node_point_distribute_in, geo_node_point_distribute_out);
 +  node_type_update(&ntype, node_point_distribute_update);
    ntype.geometry_node_execute = blender::nodes::geo_node_point_distribute_exec;
    nodeRegisterType(&ntype);
  }