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/poselib.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/poselib.c')
| -rw-r--r-- | source/blender/editors/armature/poselib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 864eaa3bdbd..6e64d332cfd 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -54,6 +54,7 @@ #include "BKE_depsgraph.h" #include "BKE_idprop.h" #include "BKE_library.h" +#include "BKE_object.h" #include "BKE_context.h" #include "BKE_report.h" @@ -170,7 +171,7 @@ static Object *get_poselib_object (bContext *C) if (sa && (sa->spacetype == SPACE_BUTS)) return CTX_data_pointer_get_type(C, "object", &RNA_Object).data; else - return ED_object_pose_armature(CTX_data_active_object(C)); + return object_pose_armature_get(CTX_data_active_object(C)); } /* Poll callback for operators that require existing PoseLib data (with poses) to work */ @@ -632,7 +633,7 @@ static int poselib_rename_invoke (bContext *C, wmOperator *op, wmEvent *evt) static int poselib_rename_exec (bContext *C, wmOperator *op) { - 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->poselib : NULL; TimeMarker *marker; char newname[64]; |