Commit: 0c3500e068ea55d0d67df0de905aaed99b58b8a9
Author: Campbell Barton
Date: Wed Apr 10 08:34:24 2019 +0200
Branches: master
https://developer.blender.org/rB0c3500e068ea55d0d67df0de905aaed99b58b8a9
Cleanup: style, shadow warning
===================================================================
M source/blender/editors/gpencil/gpencil_old.c
===================================================================
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
