[Bf-blender-cvs] [46c5fe3d8cb] greasepencil-object: WIP: Temporary hack to get something showing up when using GP in 2D editors for annotations

[Joshua Leung]

Commit: 46c5fe3d8cbbe7ef9ad63076fe6603c497ef39f8
Author: Joshua Leung
Date:   Thu Feb 8 16:57:02 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rB46c5fe3d8cbbe7ef9ad63076fe6603c497ef39f8

WIP: Temporary hack to get something showing up when using GP in 2D editors for annotations

Temporary restoration of init_palettes() for the non-2D case. Ultimately,
this will not remain, but we need to retain support for this until the
drawing code is sorted out.

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

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 6d9ddce53df..8738fd11a1d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1621,6 +1621,11 @@ static bool gp_session_initdata(bContext *C, wmOperator *op, tGPsdata *p)
 		 */
 		gp_init_palette(p);
 	}
+	else {
+		#if 1 /* XXX: Temporary hack only - Palettes won't be used here in future... */
+			gp_init_palette(p);
+		#endif
+	}
 
 	/* lock axis */
 	p->lock_axis = ts->gp_sculpt.lock_axis;