[Bf-blender-cvs] [e5858cc5bee] master: Fix T70302 Crash on entering solid view after some specific steps

[Clément Foucault]

Commit: e5858cc5bee6991c63750e0dd507cfb99d58eb5e
Author: Clément Foucault
Date:   Mon Oct 7 19:20:52 2019 +0200
Branches: master
https://developer.blender.org/rBe5858cc5bee6991c63750e0dd507cfb99d58eb5e

Fix T70302 Crash on entering solid view after some specific steps

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

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 48dd23fd530..422271dbf62 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -513,6 +513,12 @@ static void mesh_batch_cache_discard_uvedit(MeshBatchCache *cache)
   cache->tot_uv_area = 0.0f;
 
   cache->batch_ready &= ~MBC_EDITUV;
+
+  /* TODO(fclem): this is overkill and
+   * we should just reset the cache->cd_used layer concerning uvs. */
+  mesh_batch_cache_discard_shaded_tri(cache);
+  GPU_BATCH_DISCARD_SAFE(cache->batch.surface);
+  cache->batch_ready &= ~(MBC_SURF_PER_MAT | MBC_SURFACE);
 }
 
 void DRW_mesh_batch_cache_dirty_tag(Mesh *me, int mode)