[Bf-blender-cvs] [3c9c557580e] master: Fix assert in gpencil_batches_ensure

Campbell Barton noreply at git.blender.org
Sat Jun 5 11:36:52 CEST 2021


Commit: 3c9c557580e86f592b861319e9c083be0d754ecf
Author: Campbell Barton
Date:   Sat Jun 5 17:13:12 2021 +1000
Branches: master
https://developer.blender.org/rB3c9c557580e86f592b861319e9c083be0d754ecf

Fix assert in gpencil_batches_ensure

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

M	source/blender/draw/intern/draw_cache_impl_gpencil.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 49b5e0fecd3..bea9ba1122b 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -405,7 +405,7 @@ static void gpencil_batches_ensure(Object *ob, GpencilBatchCache *cache, int cfr
   if (cache->vbo == NULL) {
     /* Should be discarded together. */
     BLI_assert(cache->vbo == NULL && cache->ibo == NULL);
-    BLI_assert(cache->stroke_batch == NULL && cache->stroke_batch == NULL);
+    BLI_assert(cache->fill_batch == NULL && cache->stroke_batch == NULL);
     /* TODO/PERF: Could be changed to only do it if needed.
      * For now it's simpler to assume we always need it
      * since multiple viewport could or could not need it.



More information about the Bf-blender-cvs mailing list