Commit: 77d9ddc5ea6b9c9c18699671ea5e7c37ee31d623
Author: Clément Foucault
Date: Tue Dec 18 13:07:33 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB77d9ddc5ea6b9c9c18699671ea5e7c37ee31d623
Armature: temp workaround for crash caused by custom bone drawing
===================================================================
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 b8b53fbbb78..3837daadd02 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -318,6 +318,8 @@ static void drw_shgroup_bone_envelope(
/* Custom (geometry) */
+extern void drw_batch_cache_generate_requested(Object *custom);
+
static void drw_shgroup_bone_custom_solid(
const float (*bone_mat)[4],
const float bone_color[4], const float hint_color[4], const float
outline_color[4],
@@ -329,6 +331,9 @@ static void drw_shgroup_bone_custom_solid(
struct GPUBatch *ledges = DRW_cache_object_loose_edges_get(custom);
float final_bonemat[4][4];
+ /* XXXXXXX needs to be moved elsewhere. */
+ drw_batch_cache_generate_requested(custom);
+
if (surf || edges || ledges) {
mul_m4_m4m4(final_bonemat, g_data.ob->obmat, bone_mat);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
