blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: style, shadow warning

This commit is contained in:
Campbell Barton 2019-04-10 08:34:24 +02:00
parent 009dbc2bc9
commit 0c3500e068
Notes: blender-bot 2023-02-14 08:40:26 +01:00 
Referenced by issue #63698, Selecting Materials after creating a new file throws EXCEPTION_ACCESS_VIOLATION
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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