archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: quiet shadow variable warning, unused variable

Browse Source
This commit is contained in:
Campbell Barton
2023-01-06 13:52:56 +11:00
parent 00a20aec07
commit cb7f97891d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -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);
}

2
source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
View File

@@ -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))
{