[Bf-blender-cvs] [c74e9273a98] master: Fix T64366 DRW: Crash opening Mr Elephant scene since recent commit

Clément Foucault noreply at git.blender.org
Thu May 9 11:17:18 CEST 2019


Commit: c74e9273a9884128c929029f49210f81ee1d328a
Author: Clément Foucault
Date:   Thu May 9 11:16:54 2019 +0200
Branches: master
https://developer.blender.org/rBc74e9273a9884128c929029f49210f81ee1d328a

Fix T64366 DRW: Crash opening Mr Elephant scene since recent commit

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

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

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

diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index de203906f83..e9896261004 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -3955,6 +3955,7 @@ GPUBatch *DRW_cache_cursor_get(bool crosshair_lines)
 
 void drw_batch_cache_validate(Object *ob)
 {
+  struct Mesh *mesh_eval = ob->runtime.mesh_eval;
   switch (ob->type) {
     case OB_MESH:
       DRW_mesh_batch_cache_validate((Mesh *)ob->data);
@@ -3962,6 +3963,9 @@ void drw_batch_cache_validate(Object *ob)
     case OB_CURVE:
     case OB_FONT:
     case OB_SURF:
+      if (mesh_eval != NULL) {
+        DRW_mesh_batch_cache_validate(mesh_eval);
+      }
       DRW_curve_batch_cache_validate((Curve *)ob->data);
       break;
     case OB_MBALL:



More information about the Bf-blender-cvs mailing list