[Bf-blender-cvs] [a96b52e37f7] master: GPencil: Fix compiler warnings in previous commit

Antonio Vazquez noreply at git.blender.org
Fri Jul 2 16:33:02 CEST 2021


Commit: a96b52e37f727f14c33fa32b022fb2818ab80ff9
Author: Antonio Vazquez
Date:   Fri Jul 2 16:32:01 2021 +0200
Branches: master
https://developer.blender.org/rBa96b52e37f727f14c33fa32b022fb2818ab80ff9

GPencil: Fix compiler warnings in previous commit

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

M	source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
index 358b5577b97..63546c26068 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
@@ -176,8 +176,8 @@ static void deformStroke(GpencilModifierData *md,
         /* Use weightened factor. */
         if (mmd->flag & GP_TINT_WEIGHT_FACTOR) {
           /* Use first point for weight. */
-          MDeformVert *dvert = (gps->dvert != NULL) ? &gps->dvert[0] : NULL;
-          float weight = get_modifier_point_weight(dvert, is_inverted, def_nr);
+          MDeformVert *dvert_fill = (gps->dvert != NULL) ? &gps->dvert[0] : NULL;
+          float weight = get_modifier_point_weight(dvert_fill, is_inverted, def_nr);
           if (weight >= 0.0f) {
             fill_factor = ((mmd->flag & GP_TINT_INVERT_VGROUP) ? 1.0f - weight : weight);
           }
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c
index 76960505395..c7fe20edef7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c
@@ -249,7 +249,7 @@ static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))
   return !(mmd->target_vgname && mmd->target_vgname[0] != '\0');
 }
 
-static void distance_panel_draw(const bContext *C, Panel *panel)
+static void distance_panel_draw(const bContext *UNUSED(C), Panel *panel)
 {
   PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);



More information about the Bf-blender-cvs mailing list