[Bf-blender-cvs] [583bc7a05da] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 583bc7a05da175f3eaed6571b02f230482bfc329
Author: Hans Goudey
Date:   Wed Apr 7 21:45:55 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB583bc7a05da175f3eaed6571b02f230482bfc329

Merge branch 'master' into geometry-nodes-curve-support

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 7f8a5f6de02,ab4d9353e1b..5bd7a1b804b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -504,10 -504,8 +504,11 @@@ geometry_node_categories = 
          NodeItem("ShaderNodeSeparateRGB"),
          NodeItem("ShaderNodeCombineRGB"),
      ]),
 +    GeometryNodeCategory("GEO_CURVE", "Curve", items=[
 +        NodeItem("GeometryNodeCurveToMesh"),
 +    ]),
      GeometryNodeCategory("GEO_GEOMETRY", "Geometry", items=[
+         NodeItem("GeometryNodeBoundBox"),
          NodeItem("GeometryNodeTransform"),
          NodeItem("GeometryNodeJoinGeometry"),
      ]),
diff --cc source/blender/blenkernel/BKE_node.h
index 917090cb642,30c76dc894c..b49f559653b
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1398,7 -1398,7 +1398,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MESH_PRIMITIVE_GRID 1039
  #define GEO_NODE_ATTRIBUTE_MAP_RANGE 1040
  #define GEO_NODE_ATTRIBUTE_CLAMP 1041
- #define GEO_NODE_CURVE_TO_MESH 1042
+ #define GEO_NODE_BOUNDING_BOX 1042
++#define GEO_NODE_CURVE_TO_MESH 1043
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index ef7a976effd,496141c9247..a33c9dbefd9
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -4937,8 -4937,8 +4937,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_attribute_vector_math();
    register_node_type_geo_attribute_remove();
    register_node_type_geo_boolean();
+   register_node_type_geo_bounding_box();
    register_node_type_geo_collection_info();
 +  register_node_type_geo_curve_to_mesh();
    register_node_type_geo_edge_split();
    register_node_type_geo_is_viewport();
    register_node_type_geo_join_geometry();
diff --cc source/blender/nodes/CMakeLists.txt
index a6109f3fa0d,88482b71f68..045ba5af503
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -156,9 -156,9 +156,10 @@@ set(SR
    geometry/nodes/node_geo_attribute_separate_xyz.cc
    geometry/nodes/node_geo_attribute_vector_math.cc
    geometry/nodes/node_geo_boolean.cc
+   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_to_mesh.cc
    geometry/nodes/node_geo_edge_split.cc
    geometry/nodes/node_geo_is_viewport.cc
    geometry/nodes/node_geo_join_geometry.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 24612e63d32,4ea4fe79504..059da891315
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -42,8 -42,8 +42,9 @@@ void register_node_type_geo_attribute_s
  void register_node_type_geo_attribute_vector_math(void);
  void register_node_type_geo_attribute_remove(void);
  void register_node_type_geo_boolean(void);
+ void register_node_type_geo_bounding_box(void);
  void register_node_type_geo_collection_info(void);
 +void register_node_type_geo_curve_to_mesh(void);
  void register_node_type_geo_edge_split(void);
  void register_node_type_geo_is_viewport(void);
  void register_node_type_geo_join_geometry(void);
diff --cc source/blender/nodes/NOD_static_types.h
index c69ebddcc45,bf6bf34325a..2709ea5755f
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -309,7 -309,7 +309,8 @@@ DefNode(GeometryNode, GEO_NODE_MESH_PRI
  DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_GRID, 0, "MESH_PRIMITIVE_GRID", MeshGrid, "Grid", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MAP_RANGE, def_geo_attribute_map_range, "ATTRIBUTE_MAP_RANGE", AttributeMapRange, "Attribute Map Range", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_CLAMP, def_geo_attribute_clamp, "ATTRIBUTE_CLAMP", AttributeClamp, "Attribute Clamp", "")
+ DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox, "Bounding Box", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
  
  /* undefine macros */
  #undef DefNode