[Bf-blender-cvs] [915866f0d9f] blender-v2.83-release: Fix T75914: Assert Knife Tool

[Jeroen Bakker]

Commit: 915866f0d9fa74b912d815e4667730361672ae59
Author: Jeroen Bakker
Date:   Mon Apr 20 15:10:21 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB915866f0d9fa74b912d815e4667730361672ae59

Fix T75914: Assert Knife Tool

Actually the assert was incorrect. It tested for an active buffer, but
an batch would also be ok.

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

M	source/blender/gpu/intern/gpu_immediate.c

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

diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c
index 72e17dce776..2d093dacdce 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.c
@@ -384,7 +384,7 @@ void immEnd(void)
 {
 #if TRUST_NO_ONE
   assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */
-  assert(imm.active_buffer);
+  assert(imm.active_buffer || imm.batch);
 #endif
 
   uint buffer_bytes_used;