diff options
Diffstat (limited to 'source/blender/editors/armature/armature_intern.h')
-rw-r--r-- | source/blender/editors/armature/armature_intern.h | 109 |
1 files changed, 63 insertions, 46 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 7fe4810762e..09e4c1acae7 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -138,37 +138,37 @@ void POSE_OT_bone_layers(struct wmOperatorType *ot); /* Temporary data linking PoseChannels with the F-Curves they affect */ typedef struct tPChanFCurveLink { - struct tPChanFCurveLink *next, *prev; - - /** Object this Pose Channel belongs to. */ - struct Object *ob; - - /** F-Curves for this PoseChannel (wrapped with LinkData) */ - ListBase fcurves; - /** Pose Channel which data is attached to */ - struct bPoseChannel *pchan; - - /** RNA Path to this Pose Channel (needs to be freed when we're done) */ - char *pchan_path; - - /** transform values at start of operator (to be restored before each modal step) */ - float oldloc[3]; - float oldrot[3]; - float oldscale[3]; - float oldquat[4]; - float oldangle; - float oldaxis[3]; - - /** old bbone values (to be restored along with the transform properties) */ - float roll1, roll2; - /** (NOTE: we haven't renamed these this time, as their names are already long enough) */ - float curveInX, curveInY; - float curveOutX, curveOutY; - float ease1, ease2; - float scaleIn, scaleOut; - - /** copy of custom properties at start of operator (to be restored before each modal step) */ - struct IDProperty *oldprops; + struct tPChanFCurveLink *next, *prev; + + /** Object this Pose Channel belongs to. */ + struct Object *ob; + + /** F-Curves for this PoseChannel (wrapped with LinkData) */ + ListBase fcurves; + /** Pose Channel which data is attached to */ + struct bPoseChannel *pchan; + + /** RNA Path to this Pose Channel (needs to be freed when we're done) */ + char *pchan_path; + + /** transform values at start of operator (to be restored before each modal step) */ + float oldloc[3]; + float oldrot[3]; + float oldscale[3]; + float oldquat[4]; + float oldangle; + float oldaxis[3]; + + /** old bbone values (to be restored along with the transform properties) */ + float roll1, roll2; + /** (NOTE: we haven't renamed these this time, as their names are already long enough) */ + float curveInX, curveInY; + float curveOutX, curveOutY; + float ease1, ease2; + float scaleIn, scaleOut; + + /** copy of custom properties at start of operator (to be restored before each modal step) */ + struct IDProperty *oldprops; } tPChanFCurveLink; /* ----------- */ @@ -179,7 +179,10 @@ void poseAnim_mapping_free(ListBase *pfLinks); void poseAnim_mapping_refresh(struct bContext *C, struct Scene *scene, struct Object *ob); void poseAnim_mapping_reset(ListBase *pfLinks); -void poseAnim_mapping_autoKeyframe(struct bContext *C, struct Scene *scene, ListBase *pfLinks, float cframe); +void poseAnim_mapping_autoKeyframe(struct bContext *C, + struct Scene *scene, + ListBase *pfLinks, + float cframe); LinkData *poseAnim_mapping_getNextFCurve(ListBase *fcuLinks, LinkData *prev, const char *path); @@ -222,15 +225,27 @@ EditBone *make_boneList(struct ListBase *edbo, struct ListBase *bones, struct Bo /* duplicate method */ void preEditBoneDuplicate(struct ListBase *editbones); void postEditBoneDuplicate(struct ListBase *editbones, struct Object *ob); -struct EditBone *duplicateEditBone(struct EditBone *curBone, const char *name, struct ListBase *editbones, struct Object *ob); -void updateDuplicateSubtarget(struct EditBone *dupBone, struct ListBase *editbones, struct Object *ob); +struct EditBone *duplicateEditBone(struct EditBone *curBone, + const char *name, + struct ListBase *editbones, + struct Object *ob); +void updateDuplicateSubtarget(struct EditBone *dupBone, + struct ListBase *editbones, + struct Object *ob); /* duplicate method (cross objects) */ /* editbones is the target list */ -struct EditBone *duplicateEditBoneObjects(struct EditBone *curBone, const char *name, struct ListBase *editbones, struct Object *src_ob, struct Object *dst_ob); +struct EditBone *duplicateEditBoneObjects(struct EditBone *curBone, + const char *name, + struct ListBase *editbones, + struct Object *src_ob, + struct Object *dst_ob); /* editbones is the source list */ -void updateDuplicateSubtargetObjects(struct EditBone *dupBone, struct ListBase *editbones, struct Object *src_ob, struct Object *dst_ob); +void updateDuplicateSubtargetObjects(struct EditBone *dupBone, + struct ListBase *editbones, + struct Object *src_ob, + struct Object *dst_ob); EditBone *add_points_bone(struct Object *obedit, float head[3], float tail[3]); void bone_free(struct bArmature *arm, struct EditBone *bone); @@ -240,18 +255,20 @@ void armature_select_mirrored_ex(struct bArmature *arm, const int flag); void armature_select_mirrored(struct bArmature *arm); void armature_tag_unselect(struct bArmature *arm); -void *get_nearest_bone( - struct bContext *C, const int xy[2], bool findunsel, - struct Base **r_base); +void *get_nearest_bone(struct bContext *C, const int xy[2], bool findunsel, struct Base **r_base); -void *get_bone_from_selectbuffer( - struct Base **bases, uint bases_len, - bool is_editmode, const unsigned int *buffer, short hits, - bool findunsel, bool do_nearest, - struct Base **r_base); +void *get_bone_from_selectbuffer(struct Base **bases, + uint bases_len, + bool is_editmode, + const unsigned int *buffer, + short hits, + bool findunsel, + bool do_nearest, + struct Base **r_base); -int bone_looper(struct Object *ob, struct Bone *bone, void *data, +int bone_looper(struct Object *ob, + struct Bone *bone, + void *data, int (*bone_func)(struct Object *, struct Bone *, void *)); - #endif /* __ARMATURE_INTERN_H__ */ |