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

[Jacques Lucke]

Commit: 3d057de976359955dbc706ac218ee716c0c1c736
Author: Jacques Lucke
Date:   Thu Jun 10 09:35:41 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB3d057de976359955dbc706ac218ee716c0c1c736

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 3e05621b8ef,a67d7116874..71f25120e69
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1433,7 -1433,7 +1433,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_DELETE_GEOMETRY 1053
  #define GEO_NODE_CURVE_LENGTH 1054
  #define GEO_NODE_SELECT_BY_MATERIAL 1055
- #define GEO_NODE_ATTRIBUTE_PROCESSOR 1056
+ #define GEO_NODE_CONVEX_HULL 1056
++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1057
  
  /** \} */
  
diff --cc source/blender/nodes/CMakeLists.txt
index a5bc588f2a4,025ce79ffc5..e5151cbe6c5
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -166,7 -162,8 +166,8 @@@ set(SR
    geometry/nodes/node_geo_bounding_box.cc
    geometry/nodes/node_geo_collection_info.cc
    geometry/nodes/node_geo_common.cc
+   geometry/nodes/node_geo_convex_hull.cc
 -  geometry/nodes/node_geo_curve_length.cc  
 +  geometry/nodes/node_geo_curve_length.cc
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_delete_geometry.cc