diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-04-20 16:27:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-04-20 16:27:27 +0300 |
| commit | dcb45992bff2e4ca27a1860b9a34411f23db49a1 (patch) | |
| tree | a99a7a4454a7af81d1bda3e701dcaee4efc6bef1 /source/blender/gpu | |
| parent | b78f2675d7e573685f6c78e42ca4462d90238e37 (diff) | |
| parent | aa2544793dc2a68e6607352059b70136bde6281a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate.c | 2 |
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; |