[Bf-blender-cvs] [74294b8686a] soc-2018-npr: Fix interface lock situation reported by DarkDefender.

[Nick Wu]

Commit: 74294b8686ab107dd24b98431400a4a03ffb7bb4
Author: Nick Wu
Date:   Mon Sep 17 21:49:08 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB74294b8686ab107dd24b98431400a4a03ffb7bb4

Fix interface lock situation reported by DarkDefender.

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

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

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 1c8c570a3b5..5d83bd72323 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -408,15 +408,17 @@ void lanpr_batch_free(SceneLANPR *lanpr) {
 
 }
 
+// below are commented to prevent interface lock in some conditions.
+// should look into it,
 void lanpr_set_render_flag() {
-	BLI_spin_lock(&lanpr_share.render_flag_lock);
-	lanpr_share.during_render = 1;
-	BLI_spin_unlock(&lanpr_share.render_flag_lock);
+	//BLI_spin_lock(&lanpr_share.render_flag_lock);
+	//lanpr_share.during_render = 1;
+	//BLI_spin_unlock(&lanpr_share.render_flag_lock);
 }
 void lanpr_clear_render_flag() {
-	BLI_spin_lock(&lanpr_share.render_flag_lock);
-	lanpr_share.during_render = 0;
-	BLI_spin_unlock(&lanpr_share.render_flag_lock);
+	//BLI_spin_lock(&lanpr_share.render_flag_lock);
+	//lanpr_share.during_render = 0;
+	//BLI_spin_unlock(&lanpr_share.render_flag_lock);
 }
 int lanpr_during_render() {
 	int status;
@@ -578,6 +580,8 @@ static void lanpr_render_to_image(LANPR_Data *vedata, RenderEngine *engine, stru
 	DRW_render_object_iter(vedata, engine, draw_ctx->depsgraph, LANPR_render_cache);
 	lanpr_cache_finish(vedata);
 
+	DRW_render_instance_buffer_finish();
+
 	float clear_col[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
 	float clear_depth = 1.0f;
 	uint clear_stencil = 0xFF;