[Bf-blender-cvs] [0766941f8f0] gsoc-2021-porting-modifiers-to-nodes-solidify: rebaseing and cleanup

[Fabian Schempp]

Commit: 0766941f8f0b7c4adbb96aab0111f9b077b735ab
Author: Fabian Schempp
Date:   Thu Jun 10 21:01:34 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rB0766941f8f0b7c4adbb96aab0111f9b077b735ab

rebaseing and cleanup

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

M	source/blender/blenkernel/intern/solidify_extrude.c
M	source/blender/nodes/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/intern/solidify_extrude.c b/source/blender/blenkernel/intern/solidify_extrude.c
index 4589772f89e..f1d3fce3f8a 100644
--- a/source/blender/blenkernel/intern/solidify_extrude.c
+++ b/source/blender/blenkernel/intern/solidify_extrude.c
@@ -184,7 +184,7 @@ static void mesh_calc_hq_normal(Mesh *mesh, float (*poly_nors)[3], float (*r_ver
 /** \name Main Solidify Function
  * \{ */
 static void get_vgroup(
-    Object *ob, struct Mesh *mesh, const char *name, MDeformVert **dvert, int *defgrp_index)
+    const Object *ob, struct Mesh *mesh, const char *name, MDeformVert **dvert, int *defgrp_index)
 {
   *defgrp_index = BKE_object_defgroup_name_index(ob, name);
   *dvert = NULL;
@@ -201,9 +201,6 @@ static void get_vgroup(
 
 Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
 {
-  //printf("solidify extrude: %f, %i\n", solidify_data->offset, solidify_data->flag);
-  printf("selection data %f\n",solidify_data->selection[0]);
-
   Mesh *result;
 
   MVert *mv, *mvert, *orig_mvert;
@@ -611,10 +608,6 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
       MEM_freeN(edge_user_pairs);
     }
 
-    /////
-    /////
-    ///// V-Group influence start
-
     if (ofs_new != 0.0f) {
       uint i_orig, i_end;
       bool do_shell_align;
@@ -708,10 +701,6 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
       }
     }
 
-    ///// V-Group influende end
-    /////
-    /////
-
     if (do_bevel_convex) {
       for (uint i = 0; i < numEdges; i++) {
         if (edge_users[i] == INVALID_PAIR) {
@@ -815,8 +804,6 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
     }
 
     /* vertex group support */
-    //if (dvert) {
-      //MDeformVert *dv = dvert;
       float scalar;
 
       if (defgrp_invert) {
@@ -930,8 +917,7 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
         else {
           for (i = 0; i < numVerts; i++) {
             if (vert_lens_sq[i] < offset_sq) {
-              float scalar = sqrtf(vert_lens_sq[i]) / offset;
-              vert_angles[i] *= scalar;
+              vert_angles[i] *= sqrtf(vert_lens_sq[i]) / offset;
             }
           }
         }
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index ce486d0e8ab..ee395f0e235 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -197,7 +197,6 @@ set(SRC
   geometry/nodes/node_geo_select_by_material.cc
   geometry/nodes/node_geo_separate_components.cc
   geometry/nodes/node_geo_solidify.cc
-  geometry/nodes/node_geo_solidify_extrude.c
   geometry/nodes/node_geo_subdivide.cc
   geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_switch.cc