[Bf-blender-cvs] [d01d7d053e8] greasepencil-object: Code Cleanup - Group all palette initialisation stuff together in same function

[Joshua Leung]

Commit: d01d7d053e83e3f2b9fcfa9a8fd79043fb06fee2
Author: Joshua Leung
Date:   Mon Oct 2 15:44:00 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rBd01d7d053e83e3f2b9fcfa9a8fd79043fb06fee2

Code Cleanup - Group all palette initialisation stuff together in same function

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

M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index e975b064050..a391e434450 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1330,10 +1330,9 @@ static void gp_init_drawing_brush(ToolSettings *ts, tGPsdata *p)
 /* initialize a paint palette brush and a default color if not exist */
 static void gp_init_palette(tGPsdata *p)
 {
-	Palette *palette;
+	Palette *palette = p->palette;
 	PaletteColor *palcolor = NULL;
-
-	palette = p->palette;
+	bGPdata *pdata = p->gpd;
 
 	if (palette) {
 		/* palette needs one color */
@@ -1352,8 +1351,15 @@ static void gp_init_palette(tGPsdata *p)
 		BLI_strncpy(p->gpd->last_palette_name, palette->id.name, sizeof(p->gpd->last_palette_name));
 	}
 
-	/* asign to temp tGPsdata */
+	/* assign to temp tGPsdata */
 	p->palettecolor = palcolor;
+	
+	/* set palette colors */
+	copy_v4_v4(pdata->scolor, palcolor->rgb);
+	copy_v4_v4(pdata->sfill, palcolor->fill);
+	pdata->sflag = palcolor->flag;
+	pdata->bstroke_style = palcolor->stroke_style;
+	pdata->bfill_style = palcolor->fill_style;
 }
 
 /* (re)init new painting data */
@@ -1565,18 +1571,12 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
 	
 	/* clear out buffer (stored in gp-data), in case something contaminated it */
 	gp_session_validatebuffer(p);
+	
 	/* set brush and create a new one if null */
 	gp_init_drawing_brush(ts, p);
+	
 	/* set palette info and create a new one if null */
 	gp_init_palette(p);
-	/* set palette colors */
-	PaletteColor *palcolor = p->palettecolor;
-	bGPdata *pdata = p->gpd;
-	copy_v4_v4(pdata->scolor, palcolor->rgb);
-	copy_v4_v4(pdata->sfill, palcolor->fill);
-	pdata->sflag = palcolor->flag;
-	pdata->bstroke_style = palcolor->stroke_style;
-	pdata->bfill_style = palcolor->fill_style;
 
 	/* lock axis */
 	p->lock_axis = ts->gp_sculpt.lock_axis;