Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-03 18:32:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-03 18:32:16 +0300
commit3bf31c6d234537e2207fc71b1ef016f800803ca9 (patch)
treeb38f18b1d1035b1867f6f30d9a6b259ece1443e5 /source/blender/makesdna/DNA_action_types.h
parent1f167037923fafb198cbe9cf44544e1bbb66b827 (diff)
Move pose-bone colors into draw_data
Also only allocate necessary number of bone segments.
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
-rw-r--r--source/blender/makesdna/DNA_action_types.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index d4fd54ce7ad..87749c3b768 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -180,6 +180,16 @@ typedef enum eMotionPaths_BakeFlag {
MOTIONPATH_BAKE_HAS_PATHS = (1 << 2)
} eMotionPath_BakeFlag;
+#
+#
+typedef struct bPoseChannelDrawData {
+ float solid_color[4];
+ float wire_color[4];
+
+ int bbone_matrix_len;
+ float bbone_matrix[32][4][4];
+} bPoseChannelDrawData;
+
/* ************************************************ */
/* Poses */
@@ -261,11 +271,9 @@ typedef struct bPoseChannel {
struct bPoseChannel *bbone_prev; /* next/prev bones to use as handle references when calculating bbones (optional) */
struct bPoseChannel *bbone_next;
- float disp_solid_color[4]; /* for display only */
- float disp_wire_color[4];
-
void *temp; /* use for outliner */
- void *draw_data; /* Used to cache each bbone's segment matrix. */
+ /* Runtime data for color and bbone segment matrix. */
+ bPoseChannelDrawData *draw_data;
} bPoseChannel;