[Bf-blender-cvs] [895c41ec5d0] master: Fix Crash with armature using custom shapes

[Clément Foucault]

Commit: 895c41ec5d0f4574bedf800bf8bb6183169043f4
Author: Clément Foucault
Date:   Thu May 9 11:35:45 2019 +0200
Branches: master
https://developer.blender.org/rB895c41ec5d0f4574bedf800bf8bb6183169043f4

Fix Crash with armature using custom shapes

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

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

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

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 9b52f282944..a94d47496e0 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -336,6 +336,7 @@ static void drw_shgroup_bone_envelope(const float (*bone_mat)[4],
 
 /* Custom (geometry) */
 
+extern void drw_batch_cache_validate(Object *custom);
 extern void drw_batch_cache_generate_requested(Object *custom);
 
 static void drw_shgroup_bone_custom_solid(const float (*bone_mat)[4],
@@ -345,6 +346,10 @@ static void drw_shgroup_bone_custom_solid(const float (*bone_mat)[4],
                                           const eGPUShaderConfig sh_cfg,
                                           Object *custom)
 {
+  /* TODO(fclem) arg... less than ideal but we never iter on this object
+   * to assure batch cache is valid. */
+  drw_batch_cache_validate(custom);
+
   struct GPUBatch *surf = DRW_cache_object_surface_get(custom);
   struct GPUBatch *edges = DRW_cache_object_edge_detection_get(custom, NULL);
   struct GPUBatch *ledges = DRW_cache_object_loose_edges_get(custom);
@@ -408,6 +413,10 @@ static void drw_shgroup_bone_custom_wire(const float (*bone_mat)[4],
                                          const float color[4],
                                          Object *custom)
 {
+  /* TODO(fclem) arg... less than ideal but we never iter on this object
+   * to assure batch cache is valid. */
+  drw_batch_cache_validate(custom);
+
   struct GPUBatch *geom = DRW_cache_object_all_edges_get(custom);
 
   if (geom) {