archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Rename POSELIB_OT_blend_pose to POSELIB_OT_blend_pose_asset

Browse Source 
Rename the pose blending operator to `POSELIB_OT_blend_pose_asset`, so that
we can make an operator `POSELIB_OT_apply_pose_asset` without colliding
with the old `POSELIB_OT_apply_pose` operator (from the current pose
library system instead of the new one).

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2021-03-26 12:10:22 +01:00
parent 0eed91c8de
commit 790865e48c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/armature/armature_intern.h
View File

@@ -204,7 +204,7 @@ void POSELIB_OT_browse_interactive(struct wmOperatorType *ot);
void POSELIB_OT_apply_pose(struct wmOperatorType *ot);
/* pose_lib_2.c */
void POSELIB_OT_blend_pose(struct wmOperatorType *ot);
void POSELIB_OT_blend_pose_asset(struct wmOperatorType *ot);
/* ******************************************************* */
/* Pose Sliding Tools */

2
source/blender/editors/armature/armature_ops.c
View File

@@ -131,7 +131,7 @@ void ED_operatortypes_armature(void)
/* POSELIB */
WM_operatortype_append(POSELIB_OT_browse_interactive);
WM_operatortype_append(POSELIB_OT_apply_pose);
WM_operatortype_append(POSELIB_OT_blend_pose);
WM_operatortype_append(POSELIB_OT_blend_pose_asset);
WM_operatortype_append(POSELIB_OT_pose_add);
WM_operatortype_append(POSELIB_OT_pose_remove);

4
source/blender/editors/armature/pose_lib_2.c
View File

@@ -658,11 +658,11 @@ static bool poselib_blend_poll(bContext *C)
return poselib_asset_in_context(C);
}
void POSELIB_OT_blend_pose(wmOperatorType *ot)
void POSELIB_OT_blend_pose_asset(wmOperatorType *ot)
{
/* Identifiers: */
ot->name = "Blend Pose Library Pose";
ot->idname = "POSELIB_OT_blend_pose";
ot->idname = "POSELIB_OT_blend_pose_asset";
ot->description = "Blend the given Pose Action to the rig";
/* Callbacks: */