[Bf-blender-cvs] [cb7f97891d5] master: Cleanup: quiet shadow variable warning, unused variable

[Campbell Barton]

Commit: cb7f97891d561f7477c39cc2300f838b3677ddc2
Author: Campbell Barton
Date:   Fri Jan 6 13:52:56 2023 +1100
Branches: master
https://developer.blender.org/rBcb7f97891d561f7477c39cc2300f838b3677ddc2

Cleanup: quiet shadow variable warning, unused variable

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

M       source/blender/editors/gpencil/gpencil_edit.c
M       source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c 
b/source/blender/editors/gpencil/gpencil_edit.c
index b3f7a553a88..f6d94eeaed5 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1630,7 +1630,6 @@ static int gpencil_strokes_paste_exec(bContext *C, 
wmOperator *op)
   bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd); /* only use active for 
copy merge */
   Scene *scene = CTX_data_scene(C);
 
-  bGPDframe *gpf = gpl->actframe;
   bGPDframe *init_gpf = (is_multiedit) ? gpl->frames.first : gpl->actframe;
 
   eGP_PasteMode type = RNA_enum_get(op->ptr, "type");
@@ -1744,6 +1743,8 @@ static int gpencil_strokes_paste_exec(bContext *C, 
wmOperator *op)
             break;
           }
         }
+
+        bGPDframe *gpf;
         if (IS_AUTOKEY_ON(scene) || (gpl->actframe == NULL)) {
           gpf = BKE_gpencil_layer_frame_get(gpl, scene->r.cfra, 
GP_GETFRAME_ADD_NEW);
         }
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index b1079d1b292..1beebc3cbe8 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@ -218,7 +218,7 @@ static void bakeModifier(struct Main *UNUSED(bmain),
   generic_bake_deform_stroke(depsgraph, md, ob, false, deformStroke);
 }
 
-static void updateDepsgraph(GpencilModifierData *md,
+static void updateDepsgraph(GpencilModifierData *UNUSED(md),
                             const ModifierUpdateDepsgraphContext *ctx,
                             const int UNUSED(mode))
 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs