From 827818d37dd2c9caf16ddc2c2b8d9415d6afc3b9 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 3 May 2017 16:10:25 +0200 Subject: Rename bPoseChannel's temp/cache pointer for DrawManager to draw_data. More generic name, this remains a temp solution anyway, until we have proper handling of temp data from 'magic DEG'! ;) --- source/blender/draw/intern/draw_armature.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '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 5eca979341c..36aabdf7735 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -771,10 +771,10 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc /* Note that we need this even for one-segment bones, because box drawing need specific weirdo matrix for the box, * that we cannot use to draw end points & co. */ if (pchan) { - Mat4 *bbones_mat = pchan->bbone_matrices; + Mat4 *bbones_mat = pchan->draw_data; if (bbones_mat == NULL) { /* We just allocate max allowed segcount, we can always refine this later if really needed. */ - bbones_mat = pchan->bbone_matrices = MEM_mallocN(sizeof(*bbones_mat) * MAX_BBONE_SUBDIV, __func__); + bbones_mat = pchan->draw_data = MEM_mallocN(sizeof(*bbones_mat) * MAX_BBONE_SUBDIV, __func__); } if (bbone_segments > 1) { @@ -957,7 +957,7 @@ static void draw_bone_wire( } if (pchan) { - Mat4 *bbones_mat = pchan->bbone_matrices; + Mat4 *bbones_mat = pchan->draw_data; BLI_assert(bbones_mat != NULL); for (int i = pchan->bone->segments; i--; bbones_mat++) { @@ -992,7 +992,7 @@ static void draw_bone_box( } if (pchan) { - Mat4 *bbones_mat = pchan->bbone_matrices; + Mat4 *bbones_mat = pchan->draw_data; BLI_assert(bbones_mat != NULL); for (int i = pchan->bone->segments; i--; bbones_mat++) { -- cgit v1.2.3