[Bf-blender-cvs] [75df5d34d31] gsoc-2021-porting-modifiers-to-nodes-solidify: - some more cleanup

Fabian Schempp noreply at git.blender.org
Tue Jun 22 11:32:22 CEST 2021


Commit: 75df5d34d31c0e1a263b2df3229112b4f51408c5
Author: Fabian Schempp
Date:   Tue Jun 22 11:31:34 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rB75df5d34d31c0e1a263b2df3229112b4f51408c5

- some more cleanup

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

M	source/blender/blenkernel/BKE_solidifiy.h
M	source/blender/modifiers/intern/MOD_solidify.c
M	source/blender/modifiers/intern/MOD_solidify_util.h
M	source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc

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

diff --git a/source/blender/blenkernel/BKE_solidifiy.h b/source/blender/blenkernel/BKE_solidifiy.h
index c6a902c9def..327b68b7546 100644
--- a/source/blender/blenkernel/BKE_solidifiy.h
+++ b/source/blender/blenkernel/BKE_solidifiy.h
@@ -9,9 +9,6 @@ struct Mesh;
 typedef struct SolidifyData {
   /** Name of vertex group to use, MAX_VGROUP_NAME. */
   const Object *object;
-  char defgrp_name[64];
-  char shell_defgrp_name[64];
-  char rim_defgrp_name[64];
   /** New surface offset level. */
   float offset;
   /** Midpoint of the offset. */
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 0c02823791c..1f15b27a36b 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -129,9 +129,6 @@ static const SolidifyData solidify_data_from_modifier_data(ModifierData *md,
   const SolidifyModifierData *smd = (SolidifyModifierData *)md;
   SolidifyData solidify_data = {
       ctx->object,
-      "",
-      "",
-      "",
       smd->offset,
       smd->offset_fac,
       smd->offset_fac_vg,
@@ -150,10 +147,6 @@ static const SolidifyData solidify_data_from_modifier_data(ModifierData *md,
       NULL,
   };
 
-  BLI_strncpy(solidify_data.defgrp_name, smd->defgrp_name, MAX_NAME);
-  BLI_strncpy(solidify_data.shell_defgrp_name, smd->shell_defgrp_name, MAX_NAME);
-  BLI_strncpy(solidify_data.rim_defgrp_name, smd->rim_defgrp_name, MAX_NAME);
-
   if (!(smd->flag & MOD_SOLIDIFY_NOSHELL)) {
     solidify_data.flag |= MOD_SOLIDIFY_SHELL;
   }
diff --git a/source/blender/modifiers/intern/MOD_solidify_util.h b/source/blender/modifiers/intern/MOD_solidify_util.h
index acb18e32d04..770ab3a8141 100644
--- a/source/blender/modifiers/intern/MOD_solidify_util.h
+++ b/source/blender/modifiers/intern/MOD_solidify_util.h
@@ -23,4 +23,4 @@
 /* MOD_solidify_extrude.c */
 Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md,
                                       const ModifierEvalContext *ctx,
-                                      Mesh *mesh);
\ No newline at end of file
+                                      Mesh *mesh);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc b/source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
index 0e9bd66088f..e1a0e0905b1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
@@ -112,9 +112,6 @@ static void geo_node_solidify_exec(GeoNodeExecParams params)
 
     SolidifyData solidify_node_data = {
         self_object,
-        "",
-        "",
-        "",
         thickness,
         offset,
         0.0f,



More information about the Bf-blender-cvs mailing list