Commit: 60c84d0a648b3a73693a52e2c68643ef48a96757 Author: Fabian Schempp Date: Tue Jul 13 20:39:12 2021 +0200 Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks https://developer.blender.org/rB60c84d0a648b3a73693a52e2c68643ef48a96757
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks # Conflicts: # source/blender/blenkernel/BKE_node.h =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 14ce314af75,b1a38ec5700..8ed25d9cd12 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1458,7 -1458,7 +1458,8 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_VIEWER 1067 #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068 #define GEO_NODE_CURVE_ENDPOINTS 1069 - #define GEO_NODE_REMESH_BLOCKS 1070 + #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 ++#define GEO_NODE_REMESH_BLOCKS 1071 /** \} */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
