[Bf-blender-cvs] [5fa17ce720e] master: Mesh Batch Cache: Fix crash caused by rB3cbf2462391c

Clément Foucault noreply at git.blender.org
Mon Aug 19 18:08:49 CEST 2019


Commit: 5fa17ce720eaa12b4150f302289069a12b7bf892
Author: Clément Foucault
Date:   Mon Aug 19 18:08:27 2019 +0200
Branches: master
https://developer.blender.org/rB5fa17ce720eaa12b4150f302289069a12b7bf892

Mesh Batch Cache: Fix crash caused by rB3cbf2462391c

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

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

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

diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index abc45f5e0a2..884d39343c6 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1034,7 +1034,7 @@ void DRW_mesh_batch_cache_create_requested(
       }
       /* XXX save element buffer to avoid recreating them.
        * This is only if the cd_needed changes so it is ok to keep them.*/
-      if (cache->surface_per_mat[0]->elem) {
+      if (cache->surface_per_mat[0] && cache->surface_per_mat[0]->elem) {
         saved_elem_ranges = MEM_callocN(sizeof(saved_elem_ranges) * cache->mat_len, __func__);
         for (int i = 0; i < cache->mat_len; ++i) {
           saved_elem_ranges[i] = cache->surface_per_mat[i]->elem;



More information about the Bf-blender-cvs mailing list