[Bf-blender-cvs] [6fd836f53b0] soc-2021-porting-modifiers-to-nodes-extrude: Merged Master

[Fabian Schempp]

Commit: 6fd836f53b0b6914933ce60b6649f5981519fe98
Author: Fabian Schempp
Date:   Thu Aug 5 23:50:08 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-extrude
https://developer.blender.org/rB6fd836f53b0b6914933ce60b6649f5981519fe98

Merged Master

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 73921f3e61d,084ec20c172..bfa3c58cbe2
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1475,7 -1475,7 +1475,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_EXTRUDE 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
++#define GEO_NODE_EXTRUDE 1074
  
  /** \} */
  
diff --cc source/blender/bmesh/operators/bmo_inset.c
index b02a3e8652f,4833290aa0b..23d63bbe5ab
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@@ -1121,13 -1096,7 +1121,12 @@@ void bmo_inset_region_exec(BMesh *bm, B
              }
  
              /* apply the offset */
 -            madd_v3_v3fl(v_split->co, tvec, thickness);
 +            if (use_attributes) {
-               printf("index: %i\n", v_split->head.index);
 +              madd_v3_v3fl(v_split->co, tvec, thickness_array[v_split->head.index]);
 +            }
 +            else {
 +              madd_v3_v3fl(v_split->co, tvec, thickness);
 +            }
            }
  
            /* this saves expensive/slow glue check for common cases */