From 774cc0ab1663a5d31eeda797ac71c5143086ca98 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Sep 2012 23:10:01 +0000 Subject: fix [#30063] Weight Paint + Pose Mode: [m] key does not toggle Face Selection Masking disallow some pose operators when weight paint mode is enabled. --- source/blender/editors/armature/poseobject.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/armature/poseobject.c') diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index cd2ca16fec5..e4f1e6d3e8b 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -274,7 +274,7 @@ void POSE_OT_paths_calculate(wmOperatorType *ot) /* api callbacks */ ot->invoke = pose_calculate_paths_invoke; ot->exec = pose_calculate_paths_exec; - ot->poll = ED_operator_posemode; + ot->poll = ED_operator_posemode_exclusive; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -319,7 +319,7 @@ void POSE_OT_paths_update(wmOperatorType *ot) /* api callbakcs */ ot->exec = pose_update_paths_exec; - ot->poll = ED_operator_posemode; /* TODO: this should probably check for active bone and/or existing paths */ + ot->poll = ED_operator_posemode_exclusive; /* TODO: this should probably check for active bone and/or existing paths */ /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -380,7 +380,7 @@ void POSE_OT_paths_clear(wmOperatorType *ot) /* api callbacks */ ot->exec = pose_clear_paths_exec; - ot->poll = ED_operator_posemode; + ot->poll = ED_operator_posemode_exclusive; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -2192,7 +2192,7 @@ void POSE_OT_bone_layers(wmOperatorType *ot) /* callbacks */ ot->invoke = pose_bone_layers_invoke; ot->exec = pose_bone_layers_exec; - ot->poll = ED_operator_posemode; + ot->poll = ED_operator_posemode_exclusive; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -- cgit v1.2.3