Merge branch 'blender-v2.83-release'
This commit is contained in:
commit
a8551f93e6
@ -2865,6 +2865,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
|
|||||||
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
|
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
|
||||||
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
|
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
|
||||||
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
|
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
|
||||||
|
ED_outliner_select_sync_from_object_tag(C);
|
||||||
|
|
||||||
return OPERATOR_FINISHED;
|
return OPERATOR_FINISHED;
|
||||||
}
|
}
|
||||||
|
@ -2488,6 +2488,7 @@ static int do_outliner_operation_event(
|
|||||||
/* Only redraw, don't rebuild here because TreeElement pointers will
|
/* Only redraw, don't rebuild here because TreeElement pointers will
|
||||||
* become invalid and operations will crash. */
|
* become invalid and operations will crash. */
|
||||||
ED_region_tag_redraw_no_rebuild(region);
|
ED_region_tag_redraw_no_rebuild(region);
|
||||||
|
ED_outliner_select_sync_from_outliner(C, soops);
|
||||||
}
|
}
|
||||||
|
|
||||||
set_operation_types(soops, &soops->tree, &scenelevel, &objectlevel, &idlevel, &datalevel);
|
set_operation_types(soops, &soops->tree, &scenelevel, &objectlevel, &idlevel, &datalevel);
|
||||||
|
@ -41,6 +41,8 @@
|
|||||||
|
|
||||||
#include "DEG_depsgraph.h"
|
#include "DEG_depsgraph.h"
|
||||||
|
|
||||||
|
#include "ED_outliner.h"
|
||||||
|
|
||||||
#include "rna_internal.h" /* own include */
|
#include "rna_internal.h" /* own include */
|
||||||
|
|
||||||
static const EnumPropertyItem space_items[] = {
|
static const EnumPropertyItem space_items[] = {
|
||||||
@ -114,6 +116,7 @@ static void rna_Object_select_set(
|
|||||||
Scene *scene = CTX_data_scene(C);
|
Scene *scene = CTX_data_scene(C);
|
||||||
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
|
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
|
||||||
WM_main_add_notifier(NC_SCENE | ND_OB_SELECT, scene);
|
WM_main_add_notifier(NC_SCENE | ND_OB_SELECT, scene);
|
||||||
|
ED_outliner_select_sync_from_object_tag(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool rna_Object_select_get(Object *ob, bContext *C, ViewLayer *view_layer)
|
static bool rna_Object_select_get(Object *ob, bContext *C, ViewLayer *view_layer)
|
||||||
|
Loading…
Reference in New Issue
Block a user