[Bf-blender-cvs] [e00948e9e89] greasepencil-object: Fix errors after merge

[Antonio Vazquez]

Commit: e00948e9e891471f5c801fd4c5d6cb3c5b2886b6
Author: Antonio Vazquez
Date:   Mon Jun 11 16:00:58 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe00948e9e891471f5c801fd4c5d6cb3c5b2886b6

Fix errors after merge

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 17b9de6c4d3..bd27674df2e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1499,18 +1499,17 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
 	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
 	RenderEngineType *engine_type = engine->type;
-	// DrawEngineType *draw_engine_type = engine_type->draw_engine;
 	RenderData *r = &scene->r;
 	Render *render = engine->re;
 	/* Changing Context */
 	DRW_opengl_context_enable();
 	/* Reset before using it. */
-	memset(&DST, 0x0, offsetof(DRWManager, ogl_context));
+	drw_state_prepare_clean_for_draw(&DST);
 	DST.options.is_image_render = true;
 	DST.options.is_scene_render = true;
 	DST.options.draw_background = scene->r.alphamode == R_ADDSKY;
 	DST.buffer_finish_called = true;
-
+	
 	DST.draw_ctx = (DRWContextState) {
 		.scene = scene, .view_layer = view_layer,
 		.engine_type = engine_type,