Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-05-27 01:52:15 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-05-27 01:52:15 +0300
commita8551f93e6d57a831947befaecaeb9e47c4a46d0 (patch)
tree0087f5af92031078d37ae053b4d10e7aea5d7327 /source
parenteb5422828ac1ec50cc257314080d789f507f5c31 (diff)
parentf772a4b8fa87d537de6b579d5b4a72d1874818c3 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_add.c1
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.c1
-rw-r--r--source/blender/makesrna/intern/rna_object_api.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 2ee98f39306..22c56648fca 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -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;
}
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 53f2c6a90d4..6b65167a921 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -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);
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 2c9bdd31141..3b80714bcc5 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -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)