[Bf-blender-cvs] [c850320b358] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: c850320b35863edc35f0b0acd1c75ed48bb71542
Author: Campbell Barton
Date:   Fri Jan 19 17:21:15 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc850320b35863edc35f0b0acd1c75ed48bb71542

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 1cd82a8cd49,775eafb8fe2..87f8b568023
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -10304,26 -9976,26 +10304,26 @@@ static void give_base_to_objects
  			}
  
  			if (do_it) {
 -				base = MEM_callocN(sizeof(Base), __func__);
 -				BLI_addtail(&scene->base, base);
 +				CLAMP_MIN(ob->id.us, 0);
  
 -				if (active_lay) {
 -					ob->lay = active_lay;
 +				if (scene_collection == NULL) {
 +					scene_collection = get_scene_collection_active_or_create(scene, view_layer, FILE_ACTIVE_COLLECTION);
  				}
 +
 +				BKE_collection_object_add(&scene->id, scene_collection, ob);
 +				base = BKE_view_layer_base_find(view_layer, ob);
 +				BKE_scene_object_base_flag_sync_from_base(base);
 +
  				if (flag & FILE_AUTOSELECT) {
  					/* Note that link_object_postprocess() already checks for FILE_AUTOSELECT flag,
- 					 * but it will miss objects from non-instanciated groups... */
+ 					 * but it will miss objects from non-instantiated groups... */
 -					ob->flag |= SELECT;
 -					/* do NOT make base active here! screws up GUI stuff, if you want it do it on src/ level */
 +					if (base->flag & BASE_SELECTABLED) {
 +						base->flag |= BASE_SELECTED;
 +						BKE_scene_object_base_flag_sync_from_base(base);
 +					}
 +					/* Do NOT make base active here! screws up GUI stuff, if you want it do it on src/ level. */
  				}
  
 -				base->object = ob;
 -				base->lay = ob->lay;
 -				base->flag = ob->flag;
 -
 -				CLAMP_MIN(ob->id.us, 0);
 -				id_us_plus_no_lib((ID *)ob);
 -
  				ob->id.tag &= ~LIB_TAG_INDIRECT;
  				ob->id.tag |= LIB_TAG_EXTERN;
  			}
diff --cc source/blender/editors/space_outliner/outliner_select.c
index fcbb0986e09,12b9d273a47..e13177a862a
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -97,10 -143,10 +97,10 @@@ static eOLDrawState tree_element_active
  
  /**
   * Select object tree:
-  * CTRL+LMB: Select/Deselect object and all cildren
-  * CTRL+SHIFT+LMB: Add/Remove object and all children
+  * CTRL+LMB: Select/Deselect object and all children.
+  * CTRL+SHIFT+LMB: Add/Remove object and all children.
   */
 -static void do_outliner_object_select_recursive(Scene *scene, Object *ob_parent, bool select)
 +static void do_outliner_object_select_recursive(ViewLayer *view_layer, Object *ob_parent, bool select)
  {
  	Base *base;