diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-10 09:34:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-10 09:34:24 +0300 |
| commit | 0c3500e068ea55d0d67df0de905aaed99b58b8a9 (patch) | |
| tree | 8667a4954c8d33746446c4cfddf49d1c5c5e44d6 /source/blender/editors/gpencil | |
| parent | 009dbc2bc9fbd45f974b46835679fefae7b42561 (diff) | |
Cleanup: style, shadow warning
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_old.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_old.c b/source/blender/editors/gpencil/gpencil_old.c index f1ef46b8995..f4e1b9aa83d 100644 --- a/source/blender/editors/gpencil/gpencil_old.c +++ b/source/blender/editors/gpencil/gpencil_old.c @@ -112,7 +112,6 @@ static int gpencil_convert_old_files_exec(bContext *C, wmOperator *op) zero_v3(ob->loc); /* convert grease pencil palettes (version >= 2.78) to materials and weights */ - bGPdata *gpd = scene->gpd; for (const bGPDpalette *palette = gpd->palettes.first; palette; palette = palette->next) { for (bGPDpalettecolor *palcolor = palette->colors.first; palcolor; palcolor = palcolor->next) { @@ -174,7 +173,7 @@ static int gpencil_convert_old_files_exec(bContext *C, wmOperator *op) for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { if ((gps->colorname[0] != '\0') && - (STREQ(gps->colorname, palcolor->info))) + (STREQ(gps->colorname, palcolor->info))) { /* copy color settings */ copy_v4_v4(gpl->color, palcolor->color); |