[Bf-blender-cvs] [7866c2fb05e] soc-2018-npr: potentially fixed drawing command conflict error in F12

[Nick Wu]

Commit: 7866c2fb05e6cb90f651fada81336f18842def9d
Author: Nick Wu
Date:   Wed Aug 1 18:50:08 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB7866c2fb05e6cb90f651fada81336f18842def9d

potentially fixed drawing command conflict error in F12

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

M	source/blender/draw/engines/lanpr/lanpr_all.h
M	source/blender/draw/engines/lanpr/lanpr_engine.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index 881f1e2412c..99660b88ad9 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -802,7 +802,7 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, L
 
 void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer *DefaultFB, int is_render);
 
-void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb);
+void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render);
 
 void lanpr_set_render_flag();
 void lanpr_clear_render_flag();
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index fa9bf03b3aa..e75ee0f10f9 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -495,6 +495,8 @@ static void lanpr_render_to_image(LANPR_Data *vedata, RenderEngine *engine, stru
 	Scene *scene = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 	SceneLANPR* lanpr = &scene->lanpr;
 
+	lanpr_set_render_flag();
+
 	if (lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE ||
 		(lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->enable_intersections)) {
 		if (!lanpr->render_buffer) lanpr_create_render_buffer(lanpr);
@@ -503,8 +505,6 @@ static void lanpr_render_to_image(LANPR_Data *vedata, RenderEngine *engine, stru
 		}
 	}
 
-	lanpr_set_render_flag();
-
 	workbench_render_matrices_init(engine, draw_ctx->depsgraph);
 
 	/* refered to eevee's code */