← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/BKE_armature.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/BKE_armature.h
124
124
void BKE_rotMode_change_values(float quat[4], float eul[3], float axis[3], float *angle, short oldMode, short newMode);
125
125
 
126
126
/* B-Bone support */
 
127
#define MAX_BBONE_SUBDIV    32
 
128
 
127
129
typedef struct Mat4 {
128
130
        float mat[4][4];
129
131
} Mat4;
130
132
 
131
 
Mat4 *b_bone_spline_setup(struct bPoseChannel *pchan, int rest);
 
133
void b_bone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BBONE_SUBDIV]);
132
134
 
133
135
/* like EBONE_VISIBLE */
134
136
#define PBONE_VISIBLE(arm, bone) ( \
135
 
        CHECK_TYPE_INLINE(arm, bArmature), \
136
 
        CHECK_TYPE_INLINE(bone, Bone), \
 
137
        CHECK_TYPE_INLINE(arm, bArmature *), \
 
138
        CHECK_TYPE_INLINE(bone, Bone *), \
137
139
        (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P)) \
138
140
        )
139
141