diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:48:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:48:55 +0400 |
commit | 9b06435653522400c7136ae3cfc6ee6b52ae1378 (patch) | |
tree | 09ba1d46e3c9e7268729b4b023bb707b07d41ab8 /source/blender/editors/armature/poseSlide.c | |
parent | dd2a2ec6993060f3dbf62c64c4ff56bcca02c54f (diff) |
move ED_object_pose_armature --> object_pose_armature_get to so we dont get bad level calls in the weight paint branch.
Diffstat (limited to 'source/blender/editors/armature/poseSlide.c')
-rw-r--r-- | source/blender/editors/armature/poseSlide.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index b0ff60455cf..16888908bab 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -51,6 +51,7 @@ #include "BKE_fcurve.h" #include "BKE_context.h" +#include "BKE_object.h" #include "BKE_report.h" #include "RNA_access.h" @@ -129,7 +130,7 @@ static int pose_slide_init (bContext *C, wmOperator *op, short mode) /* get info from context */ pso->scene= CTX_data_scene(C); - pso->ob= ED_object_pose_armature(CTX_data_active_object(C)); + pso->ob= object_pose_armature_get(CTX_data_active_object(C)); pso->arm= (pso->ob)? pso->ob->data : NULL; pso->sa= CTX_wm_area(C); /* only really needed when doing modal() */ pso->ar= CTX_wm_region(C); /* only really needed when doing modal() */ @@ -1164,7 +1165,7 @@ static void pose_propagate_fcurve (wmOperator *op, Object *ob, FCurve *fcu, static int pose_propagate_exec (bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Object *ob= ED_object_pose_armature(CTX_data_active_object(C)); + Object *ob= object_pose_armature_get(CTX_data_active_object(C)); bAction *act= (ob && ob->adt)? ob->adt->action : NULL; ListBase pflinks = {NULL, NULL}; |