blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Nathan Craddock 2020-05-26 16:52:15 -06:00
parent eb5422828a f772a4b8fa
commit a8551f93e6
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/object/object_add.c
View File

@ -2865,6 +2865,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
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_ACTIVE, scene);
ED_outliner_select_sync_from_object_tag(C);
return OPERATOR_FINISHED;
}

1
source/blender/editors/space_outliner/outliner_tools.c
View File

@ -2488,6 +2488,7 @@ static int do_outliner_operation_event(
/* Only redraw, don't rebuild here because TreeElement pointers will
* become invalid and operations will crash. */
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);

3
source/blender/makesrna/intern/rna_object_api.c
View File

@ -41,6 +41,8 @@
#include "DEG_depsgraph.h"
#include "ED_outliner.h"
#include "rna_internal.h" /* own include */
static const EnumPropertyItem space_items[] = {
@ -114,6 +116,7 @@ static void rna_Object_select_set(
Scene *scene = CTX_data_scene(C);
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
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)