[Bf-blender-cvs] [cffe15e9c9e] blender2.8: Fix all objects being selected when opening pre-2.80 files

Julian Eisel noreply at git.blender.org
Fri May 5 19:32:55 CEST 2017


Commit: cffe15e9c9ead5dfe0c01deac8d7cc292fce95ef
Author: Julian Eisel
Date:   Fri May 5 19:28:02 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBcffe15e9c9ead5dfe0c01deac8d7cc292fce95ef

Fix all objects being selected when opening pre-2.80 files

Caused by rBe87ddda149b. Selecting objects shouldn't be done in such a
low level function anyway (IMHO).
Made sure duplicating objects still works correctly.

===================================================================

M	source/blender/blenkernel/intern/layer.c
M	source/blender/editors/object/object_add.c

===================================================================

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 13ec6ccbe75..baecd64504c 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -806,7 +806,6 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj
 
 	if (is_selectable) {
 		base->flag |= BASE_SELECTABLED;
-		base->flag |= BASE_SELECTED;
 	}
 
 	BLI_addtail(&lc->object_bases, BLI_genericNodeN(base));
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 68332004e54..177168aa3c3 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2266,6 +2266,7 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 		/* note that this is safe to do with this context iterator,
 		 * the list is made in advance */
 		ED_object_base_select(base, BA_DESELECT);
+		ED_object_base_select(basen, BA_SELECT);
 
 		if (basen == NULL) {
 			continue;




More information about the Bf-blender-cvs mailing list