diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/poselib.c | 14 | ||||
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 17 | ||||
-rw-r--r-- | source/blender/editors/space_action/action_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_ipo/ipo_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 4 |
5 files changed, 20 insertions, 19 deletions
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index ffbc787f01c..66d1776961f 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -193,7 +193,8 @@ bAction *poselib_init_new (Object *ob) /* init object's poselib action (unlink old one if there) */ if (ob->poselib) ob->poselib->id.us--; - ob->poselib= add_empty_action("PoseLib"); + // XXX old anim stuff + // ob->poselib= add_empty_action("PoseLib"); return ob->poselib; } @@ -272,11 +273,11 @@ void poselib_validate_act (bAction *act) } /* ************************************************************* */ +#if 0 // XXX old animation system /* This function adds an ipo-curve of the right type where it's needed */ static IpoCurve *poselib_verify_icu (Ipo *ipo, int adrcode) { -#if 0 // XXX old animation system IpoCurve *icu; for (icu= ipo->curve.first; icu; icu= icu->next) { @@ -297,9 +298,8 @@ static IpoCurve *poselib_verify_icu (Ipo *ipo, int adrcode) } return icu; -#endif // XXX old animation system - return NULL; } +#endif // XXX old animation system /* This tool adds the current pose to the poselib * Note: Standard insertkey cannot be used for this due to its limitations @@ -311,8 +311,8 @@ void poselib_add_current_pose (Scene *scene, Object *ob, int val) bPoseChannel *pchan; TimeMarker *marker; bAction *act; - bActionChannel *achan; - IpoCurve *icu; + // bActionChannel *achan; + // IpoCurve *icu; int frame; char name[64]; @@ -430,7 +430,7 @@ void poselib_remove_pose (Object *ob, TimeMarker *marker) { bPose *pose= (ob) ? ob->pose : NULL; bAction *act= (ob) ? ob->poselib : NULL; - bActionChannel *achan; + // bActionChannel *achan; char *menustr; int val; diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 80b67ac70ac..da79c8b1bad 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -86,7 +86,6 @@ static void BIF_undo_push() {} static void countall() {} static void add_constraint() {} static void select_actionchannel_by_name() {} -static int autokeyframe_cfra_can_key() {return 0;} static void autokeyframe_pose_cb_func() {} /* ************* XXX *************** */ @@ -1423,7 +1422,8 @@ void pose_movetolayer(Scene *scene) } } - +#if 0 +// XXX old sys /* for use with pose_relax only */ static int pose_relax_icu(struct IpoCurve *icu, float framef, float *val, float *frame_prev, float *frame_next) { @@ -1479,6 +1479,7 @@ static int pose_relax_icu(struct IpoCurve *icu, float framef, float *val, float return 1; } } +#endif void pose_relax(Scene *scene) { @@ -1487,19 +1488,19 @@ void pose_relax(Scene *scene) bAction *act; bArmature *arm; - IpoCurve *icu_w, *icu_x, *icu_y, *icu_z; +// IpoCurve *icu_w, *icu_x, *icu_y, *icu_z; bPoseChannel *pchan; - bActionChannel *achan; - float framef = F_CFRA; - float frame_prev, frame_next; - float quat_prev[4], quat_next[4], quat_interp[4], quat_orig[4]; +// bActionChannel *achan; +// float framef = F_CFRA; +// float frame_prev, frame_next; +// float quat_prev[4], quat_next[4], quat_interp[4], quat_orig[4]; int do_scale = 0; int do_loc = 0; int do_quat = 0; int flag = 0; - int do_x, do_y, do_z; +// int do_x, do_y, do_z; if (!ob) return; diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 6e19982c7c7..87741d82a1a 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -255,10 +255,10 @@ static float actcopy_firstframe= 999999999.0f; // XXX find some header to put this in! void free_actcopybuf () { +#if 0 // XXX old animation system bActionChannel *achan, *anext; bConstraintChannel *conchan, *cnext; -#if 0 // XXX old animation system for (achan= actcopybuf.first; achan; achan= anext) { anext= achan->next; diff --git a/source/blender/editors/space_ipo/ipo_draw.c b/source/blender/editors/space_ipo/ipo_draw.c index b492dbef94b..653dc05a981 100644 --- a/source/blender/editors/space_ipo/ipo_draw.c +++ b/source/blender/editors/space_ipo/ipo_draw.c @@ -481,7 +481,7 @@ static void draw_ipocurve_repeat_normal (IpoCurve *icu, View2D *v2d, float cycxo v4[0]= bezt->vec[1][0]+cycxofs; v4[1]= bezt->vec[1][1]+cycyofs; - correct_bezpart(v1, v2, v3, v4); +// XXX old sys! correct_bezpart(v1, v2, v3, v4); forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3); forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3); diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 16372791736..3556e27bbb7 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -2024,8 +2024,8 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, Object *ob) { bArmature *arm= ob->data; bPoseChannel *pchan; - bAction *act; // XXX old animsys - watch it! - bActionChannel *achan; + // bAction *act; // XXX old animsys - watch it! + // bActionChannel *achan; ActKeyColumn *ak; ListBase keys; float *fp, *fp_start; |