Merge branch 'master' into blender2.8
This commit is contained in:
commit
debe3011f6
|
@ -82,34 +82,42 @@ Object *ED_pose_object_from_context(bContext *C)
|
|||
}
|
||||
|
||||
/* This function is used to process the necessary updates for */
|
||||
void ED_armature_enter_posemode(bContext *C, Base *base)
|
||||
bool ED_object_posemode_enter_ex(struct Main *bmain, Base *base)
|
||||
{
|
||||
ReportList *reports = CTX_wm_reports(C);
|
||||
Object *ob = base->object;
|
||||
|
||||
if (ID_IS_LINKED(ob)) {
|
||||
BKE_report(reports, RPT_WARNING, "Cannot pose libdata");
|
||||
return;
|
||||
}
|
||||
BLI_assert(!ID_IS_LINKED(ob));
|
||||
bool ok = false;
|
||||
|
||||
switch (ob->type) {
|
||||
case OB_ARMATURE:
|
||||
ob->restore_mode = ob->mode;
|
||||
ob->mode |= OB_MODE_POSE;
|
||||
/* Inform all CoW versions that we changed the mode. */
|
||||
DEG_id_tag_update_ex(CTX_data_main(C), &ob->id, DEG_TAG_COPY_ON_WRITE);
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_POSE, NULL);
|
||||
|
||||
DEG_id_tag_update_ex(bmain, &ob->id, DEG_TAG_COPY_ON_WRITE);
|
||||
ok = true;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
/* XXX: disabled as this would otherwise cause a nasty loop... */
|
||||
//ED_object_mode_toggle(C, ob->mode);
|
||||
|
||||
return ok;
|
||||
}
|
||||
bool ED_object_posemode_enter(bContext *C, Base *base)
|
||||
{
|
||||
ReportList *reports = CTX_wm_reports(C);
|
||||
if (ID_IS_LINKED(base->object)) {
|
||||
BKE_report(reports, RPT_WARNING, "Cannot pose libdata");
|
||||
return false;
|
||||
}
|
||||
struct Main *bmain = CTX_data_main(C);
|
||||
bool ok = ED_object_posemode_enter_ex(bmain, base);
|
||||
if (ok) {
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_POSE, NULL);
|
||||
}
|
||||
return ok;
|
||||
}
|
||||
|
||||
void ED_armature_exit_posemode(bContext *C, Base *base)
|
||||
void ED_object_posemode_exit(bContext *C, Base *base)
|
||||
{
|
||||
if (base) {
|
||||
Object *ob = base->object;
|
||||
|
|
|
@ -205,8 +205,9 @@ void ED_armature_ebone_listbase_free(struct ListBase *lb);
|
|||
void ED_armature_ebone_listbase_copy(struct ListBase *lb_dst, struct ListBase *lb_src);
|
||||
|
||||
/* poseobject.c */
|
||||
void ED_armature_exit_posemode(struct bContext *C, struct Base *base);
|
||||
void ED_armature_enter_posemode(struct bContext *C, struct Base *base);
|
||||
void ED_object_posemode_exit(struct bContext *C, struct Base *base);
|
||||
bool ED_object_posemode_enter_ex(struct Main *bmain, struct Base *base);
|
||||
bool ED_object_posemode_enter(struct bContext *C, struct Base *base);
|
||||
void ED_pose_de_selectall(struct Object *ob, int select_mode, const bool ignore_visibility);
|
||||
void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select);
|
||||
void ED_pose_recalculate_paths(struct bContext *C, struct Scene *scene, struct Object *ob);
|
||||
|
|
|
@ -512,7 +512,7 @@ static int posemode_exec(bContext *C, wmOperator *op)
|
|||
Base *base = CTX_data_active_base(C);
|
||||
Object *ob = base->object;
|
||||
const int mode_flag = OB_MODE_POSE;
|
||||
const bool is_mode_set = (ob->mode & mode_flag) != 0;
|
||||
bool is_mode_set = (ob->mode & mode_flag) != 0;
|
||||
|
||||
if (!is_mode_set) {
|
||||
if (!ED_object_mode_compat_set(C, ob, mode_flag, op->reports)) {
|
||||
|
@ -523,13 +523,15 @@ static int posemode_exec(bContext *C, wmOperator *op)
|
|||
if (ob->type == OB_ARMATURE) {
|
||||
if (ob == CTX_data_edit_object(C)) {
|
||||
ED_object_editmode_exit(C, EM_FREEDATA | EM_DO_UNDO);
|
||||
ED_armature_enter_posemode(C, base);
|
||||
is_mode_set = false;
|
||||
}
|
||||
else if (is_mode_set)
|
||||
ED_armature_exit_posemode(C, base);
|
||||
else
|
||||
ED_armature_enter_posemode(C, base);
|
||||
|
||||
if (is_mode_set) {
|
||||
ED_object_posemode_exit(C, base);
|
||||
}
|
||||
else {
|
||||
ED_object_posemode_enter(C, base);
|
||||
}
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
|
|
@ -671,9 +671,9 @@ static eOLDrawState tree_element_active_pose(
|
|||
ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO);
|
||||
|
||||
if (ob->mode & OB_MODE_POSE)
|
||||
ED_armature_exit_posemode(C, base);
|
||||
ED_object_posemode_exit(C, base);
|
||||
else
|
||||
ED_armature_enter_posemode(C, base);
|
||||
ED_object_posemode_enter(C, base);
|
||||
}
|
||||
else {
|
||||
if (ob->mode & OB_MODE_POSE) {
|
||||
|
|
Loading…
Reference in New Issue