[Bf-blender-cvs] [28b78480697] greasepencil-object: Adapt code to new context methods

[Antonio Vazquez]

Commit: 28b784806970a934a1e013f624992e77f23f1b5b
Author: Antonio Vazquez
Date:   Tue Apr 25 21:21:58 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB28b784806970a934a1e013f624992e77f23f1b5b

Adapt code to new context methods

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

M	source/blender/draw/engines/gpencil/gpencil_draw.c
M	source/blender/draw/engines/gpencil/gpencil_mode.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw.c b/source/blender/draw/engines/gpencil/gpencil_draw.c
index 55984183343..46b875d099c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw.c
@@ -190,10 +190,10 @@ void gpencil_tpoint_to_point(Scene *scene, ARegion *ar, ScrArea *sa, const tGPsp
 /* create batch geometry data for current buffer for one point stroke shader */
 Batch *gpencil_get_buffer_point_geom(bGPdata *gpd, short thickness)
 {
-	const struct bContext *C = DRW_get_context();
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	Scene *scene = draw_ctx->scene;
+	ScrArea *sa = CTX_wm_area(draw_ctx->evil_C);
+	ARegion *ar = draw_ctx->ar;
 
 	const tGPspoint *tpt = gpd->sbuffer;
 	bGPDspoint pt;
@@ -230,10 +230,10 @@ Batch *gpencil_get_buffer_point_geom(bGPdata *gpd, short thickness)
 /* create batch geometry data for current buffer stroke shader */
 Batch *gpencil_get_buffer_stroke_geom(bGPdata *gpd, short thickness)
 {
-	const struct bContext *C = DRW_get_context();
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	Scene *scene = draw_ctx->scene;
+	ScrArea *sa = CTX_wm_area(draw_ctx->evil_C);
+	ARegion *ar = draw_ctx->ar;
 
 	tGPspoint *points = gpd->sbuffer;
 	int totpoints = gpd->sbuffer_size;
@@ -280,10 +280,10 @@ Batch *gpencil_get_buffer_fill_geom(const tGPspoint *points, int totpoints, floa
 		return NULL;
 	}
 
-	const struct bContext *C = DRW_get_context();
-	Scene *scene = CTX_data_scene(C);
-	ScrArea *sa = CTX_wm_area(C);
-	ARegion *ar = CTX_wm_region(C);
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	Scene *scene = draw_ctx->scene;
+	ScrArea *sa = CTX_wm_area(draw_ctx->evil_C);
+	ARegion *ar = draw_ctx->ar;
 
 	int tot_triangles = totpoints - 2;
 	/* allocate memory for temporary areas */
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c b/source/blender/draw/engines/gpencil/gpencil_mode.c
index 7bcb54ed0b1..4eb92f7922d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -270,10 +270,10 @@ static void GPENCIL_cache_init(void *vedata)
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 	DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 
-	const struct bContext *C = DRW_get_context();
-	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	PaletteColor *palcolor = CTX_data_active_palettecolor(C);
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	Scene *scene = draw_ctx->scene;
+	SceneLayer *sl = draw_ctx->sl;
+	PaletteColor *palcolor = CTX_data_active_palettecolor(draw_ctx->evil_C);
 
 	if (!stl->g_data) {
 		/* Alloc transient pointers */
@@ -562,9 +562,9 @@ static void GPENCIL_cache_populate(void *vedata, Object *ob)
 {
 	GPENCIL_PassList *psl = ((GPENCIL_Data *)vedata)->psl;
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
-	const bContext *C = DRW_get_context();
-	Scene *scene = CTX_data_scene(C);
-	ToolSettings *ts = CTX_data_tool_settings(C);
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	Scene *scene = draw_ctx->scene;
+	ToolSettings *ts = CTX_data_tool_settings(draw_ctx->evil_C);
 
 	UNUSED_VARS(psl, stl);