Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2020-04-20 16:10:21 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2020-04-20 16:10:21 +0300
commit915866f0d9fa74b912d815e4667730361672ae59 (patch)
treed2c7d80cf9d0bb1852eca2e38395b66c550aac41 /source/blender
parent25e774422c00fe708475671f4a4a89a0c696d105 (diff)
Fix T75914: Assert Knife Tool
Actually the assert was incorrect. It tested for an active buffer, but an batch would also be ok.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/intern/gpu_immediate.c2
1 files changed, 1 insertions, 1 deletions
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;