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:
authorDalai Felinto <dfelinto@gmail.com>2018-01-25 14:45:13 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-25 14:52:24 +0300
commit8e341633e986ccbc9394c0317df12299aba453d1 (patch)
tree3ce5ab215a407bad67af4f08f385b40dff2dd9eb /source
parent2d46ea52cdd69f929ad7efe8e482cfc0a16de35f (diff)
Fix T50967: When you move an icon from the outliner area object doesn't show up
We can't have more than one NOTE_SUBTYPE in the same notifier. This is a partial revert of: cd4d5dcb468a. In particular to the part concerning "Also fixed a missing notifier of the object instancing operator". Not only this was mixed with the original reason for the commit for no reason, but it actually introduced a bug. Bad, bad developers ;) Note: Although this commit is not needed for master, blender2.8 requires it for the forementioned bug report.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 5048b70546c..9746acc7f8e 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2398,7 +2398,8 @@ static int add_named_exec(bContext *C, wmOperator *op)
MEM_freeN(base);
- WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT | ND_OB_ACTIVE, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
return OPERATOR_FINISHED;
}