[Bf-blender-cvs] [fa06eb9b977] gsoc-2021-porting-modifiers-to-nodes-solidify: - added output groups for rim and fill

Fabian Schempp noreply at git.blender.org
Tue Jun 22 10:49:55 CEST 2021


Commit: fa06eb9b977df310a7847aab5efd6909cc575a2b
Author: Fabian Schempp
Date:   Wed Jun 16 10:01:22 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rBfa06eb9b977df310a7847aab5efd6909cc575a2b

- added output groups for rim and fill

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

M	source/blender/blenkernel/intern/solidify_extrude.c

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

diff --git a/source/blender/blenkernel/intern/solidify_extrude.c b/source/blender/blenkernel/intern/solidify_extrude.c
index f1d3fce3f8a..03885770ff6 100644
--- a/source/blender/blenkernel/intern/solidify_extrude.c
+++ b/source/blender/blenkernel/intern/solidify_extrude.c
@@ -621,10 +621,10 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
         //if (dvert) {
           //MDeformVert *dv = &dvert[i];
           if (defgrp_invert) {
-            scalar_short_vgroup = 1.0f - solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+            scalar_short_vgroup = 1.0f - solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           }
           else {
-            scalar_short_vgroup = solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+            scalar_short_vgroup = solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           }
           scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) *
                                 scalar_short;
@@ -668,10 +668,10 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
         //if (dvert) {
           //MDeformVert *dv = &dvert[i];
           if (defgrp_invert) {
-            scalar_short_vgroup = 1.0f - solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+            scalar_short_vgroup = 1.0f - solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           }
           else {
-            scalar_short_vgroup = solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+            scalar_short_vgroup = solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           }
           scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) *
                                 scalar_short;
@@ -808,14 +808,14 @@ Mesh *solidify_extrude(const SolidifyData *solidify_data, Mesh *mesh)
 
       if (defgrp_invert) {
         for (i = 0; i < numVerts; i++){//}, dv++) {
-          scalar = 1.0f - solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+          scalar = 1.0f - solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           scalar = offset_fac_vg + (scalar * offset_fac_vg_inv);
           vert_angles[i] *= scalar;
         }
       }
       else {
         for (i = 0; i < numVerts; i++){//, dv++) {
-          scalar = solidify_data->selection[i];//BKE_defvert_find_weight(dv, defgrp_index);
+          scalar = solidify_data->distance[i];//BKE_defvert_find_weight(dv, defgrp_index);
           scalar = offset_fac_vg + (scalar * offset_fac_vg_inv);
           vert_angles[i] *= scalar;
         }



More information about the Bf-blender-cvs mailing list