diff options
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_add.c | 14 | ||||
-rw-r--r-- | source/blender/editors/armature/armature_edit.c | 3 | ||||
-rw-r--r-- | source/blender/editors/armature/armature_relations.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_group.c | 3 |
4 files changed, 1 insertions, 21 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index d941f8ce95f..dfb274fdefe 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -53,7 +53,6 @@ #include "WM_types.h" #include "ED_armature.h" -#include "ED_outliner.h" #include "ED_screen.h" #include "ED_view3d.h" @@ -223,7 +222,6 @@ static int armature_click_extrude_exec(bContext *C, wmOperator *UNUSED(op)) WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); DEG_id_tag_update(&obedit->id, ID_RECALC_SELECT); - ED_outliner_select_sync_from_edit_bone_tag(C); return OPERATOR_FINISHED; } @@ -1051,8 +1049,6 @@ static int armature_duplicate_selected_exec(bContext *C, wmOperator *op) } MEM_freeN(objects); - ED_outliner_select_sync_from_edit_bone_tag(C); - return OPERATOR_FINISHED; } @@ -1525,13 +1521,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) } MEM_freeN(objects); - if (!changed_multi) { - return OPERATOR_CANCELLED; - } - - ED_outliner_select_sync_from_edit_bone_tag(C); - - return OPERATOR_FINISHED; + return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } void ARMATURE_OT_extrude(wmOperatorType *ot) @@ -1602,7 +1592,6 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op) /* note, notifier might evolve */ WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); DEG_id_tag_update(&obedit->id, ID_RECALC_SELECT); - ED_outliner_select_sync_from_edit_bone_tag(C); return OPERATOR_FINISHED; } @@ -1693,7 +1682,6 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op) /* note, notifier might evolve */ WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); DEG_id_tag_update(&obedit->id, ID_RECALC_SELECT); - ED_outliner_select_sync_from_edit_bone_tag(C); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index a7a705a6202..8a7afe13a2f 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -54,7 +54,6 @@ #include "WM_types.h" #include "ED_armature.h" -#include "ED_outliner.h" #include "ED_screen.h" #include "ED_view3d.h" @@ -1284,7 +1283,6 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op)) BKE_pose_tag_recalc(CTX_data_main(C), obedit->pose); WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); DEG_id_tag_update(&arm->id, ID_RECALC_SELECT); - ED_outliner_select_sync_from_edit_bone_tag(C); } } MEM_freeN(objects); @@ -1460,7 +1458,6 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op)) ED_armature_edit_refresh_layer_used(arm); WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); DEG_id_tag_update(&arm->id, ID_RECALC_SELECT); - ED_outliner_select_sync_from_edit_bone_tag(C); } } MEM_freeN(objects); diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 5f3b876efaf..1e05266c77d 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -58,7 +58,6 @@ #include "ED_armature.h" #include "ED_object.h" -#include "ED_outliner.h" #include "ED_screen.h" #include "UI_interface.h" @@ -708,7 +707,6 @@ static int separate_armature_exec(bContext *C, wmOperator *op) if (ok) { BKE_report(op->reports, RPT_INFO, "Separated bones"); - ED_outliner_select_sync_from_object_tag(C); } return OPERATOR_FINISHED; diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index c10e204e3a4..9cd87f476d4 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -44,7 +44,6 @@ #include "WM_types.h" #include "ED_armature.h" -#include "ED_outliner.h" #include "ED_screen.h" #include "UI_interface.h" @@ -485,7 +484,6 @@ static int pose_group_select_exec(bContext *C, wmOperator *UNUSED(op)) bArmature *arm = ob->data; DEG_id_tag_update(&arm->id, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); - ED_outliner_select_sync_from_pose_bone_tag(C); return OPERATOR_FINISHED; } @@ -520,7 +518,6 @@ static int pose_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) bArmature *arm = ob->data; DEG_id_tag_update(&arm->id, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); - ED_outliner_select_sync_from_pose_bone_tag(C); return OPERATOR_FINISHED; } |