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

[Jacques Lucke]

Commit: b9c8bb425495bde50b91faf0cd8bce191f8f4577
Author: Jacques Lucke
Date:   Tue Jun 8 16:32:51 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rBb9c8bb425495bde50b91faf0cd8bce191f8f4577

Merge branch 'master' into temp-attribute-processor

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 7da9baee095,16da621a0fa..31549351792
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1432,7 -1432,7 +1432,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_MESH_TO_CURVE 1052
  #define GEO_NODE_DELETE_GEOMETRY 1053
  #define GEO_NODE_CURVE_LENGTH 1054
- #define GEO_NODE_ATTRIBUTE_PROCESSOR 1055
+ #define GEO_NODE_SELECT_BY_MATERIAL 1055
++#define GEO_NODE_ATTRIBUTE_PROCESSOR 1056
  
  /** \} */
  
diff --cc source/blender/bmesh/CMakeLists.txt
index 4bd88ae62d7,ec282888ffa..59dc1e5a14f
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@@ -102,10 -102,12 +102,14 @@@ set(SR
    intern/bmesh_mesh_convert.h
    intern/bmesh_mesh_duplicate.c
    intern/bmesh_mesh_duplicate.h
+   intern/bmesh_mesh_normals.c
+   intern/bmesh_mesh_normals.h
+   intern/bmesh_mesh_partial_update.c
+   intern/bmesh_mesh_partial_update.h
    intern/bmesh_mesh_tessellate.c
    intern/bmesh_mesh_tessellate.h
 +  intern/bmesh_mesh_partial_update.c
 +  intern/bmesh_mesh_partial_update.h
    intern/bmesh_mesh_validate.c
    intern/bmesh_mesh_validate.h
    intern/bmesh_mods.c