Revert "Outliner: Fix selection sync for various operators"
This reverts commit 92d62148be
.
When merging in from blender-v2.83-release the merge was somehow rebased
after viewing the log.
This commit is contained in:
parent
92d62148be
commit
e590199949
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -58,7 +58,6 @@
|
|||
|
||||
#include "ED_curve.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_transform.h"
|
||||
#include "ED_transform_snap_object_context.h"
|
||||
|
@ -1501,8 +1500,6 @@ static int separate_exec(bContext *C, wmOperator *op)
|
|||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
ED_outliner_select_sync_from_object_tag(C);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,6 @@
|
|||
|
||||
#include "ED_gpencil.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_select_utils.h"
|
||||
#include "ED_space_api.h"
|
||||
|
@ -4366,7 +4365,6 @@ static int gp_stroke_separate_exec(bContext *C, wmOperator *op)
|
|||
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
|
||||
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_SELECTED, NULL);
|
||||
ED_outliner_select_sync_from_object_tag(C);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
|
|
@ -29,13 +29,12 @@ extern "C" {
|
|||
|
||||
struct ListBase;
|
||||
struct bContext;
|
||||
struct Base;
|
||||
|
||||
bool ED_outliner_collections_editor_poll(struct bContext *C);
|
||||
|
||||
void ED_outliner_selected_objects_get(const struct bContext *C, struct ListBase *objects);
|
||||
|
||||
struct Base *ED_outliner_give_base_under_cursor(struct bContext *C, const int mval[2]);
|
||||
Base *ED_outliner_give_base_under_cursor(struct bContext *C, const int mval[2]);
|
||||
|
||||
void ED_outliner_select_sync_from_object_tag(struct bContext *C);
|
||||
void ED_outliner_select_sync_from_edit_bone_tag(struct bContext *C);
|
||||
|
|
|
@ -69,7 +69,6 @@
|
|||
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_transform.h"
|
||||
#include "ED_uvedit.h"
|
||||
|
@ -4405,7 +4404,6 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
|
|||
/* delay depsgraph recalc until all objects are duplicated */
|
||||
DEG_relations_tag_update(bmain);
|
||||
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
|
||||
ED_outliner_select_sync_from_object_tag(C);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
|
|
@ -2048,7 +2048,6 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
|
|||
DEG_relations_tag_update(bmain);
|
||||
WM_event_add_notifier(C, NC_SCENE, scene);
|
||||
WM_main_add_notifier(NC_OBJECT | ND_DRAW, NULL);
|
||||
ED_outliner_select_sync_from_object_tag(C);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_numinput.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_sequencer.h"
|
||||
#include "ED_space_api.h"
|
||||
|
@ -3562,7 +3561,6 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
|
|||
|
||||
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
|
||||
ED_outliner_select_sync_from_sequence_tag(C);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_select_utils.h"
|
||||
#include "ED_transform.h"
|
||||
|
@ -118,7 +117,6 @@ static int view3d_pastebuffer_exec(bContext *C, wmOperator *op)
|
|||
}
|
||||
|
||||
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
||||
ED_outliner_select_sync_from_object_tag(C);
|
||||
|
||||
BKE_reportf(op->reports, RPT_INFO, "%d object(s) pasted", num_pasted);
|
||||
|
||||
|
|
Loading…
Reference in New Issue