[Bf-blender-cvs] [a414edc] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: a414edc0affe216e99afa41428af5c4449463308
Author: Bastien Montagne
Date:   Tue Jan 12 16:01:17 2016 +0100
Branches: id-remap
https://developer.blender.org/rBa414edc0affe216e99afa41428af5c4449463308

Merge branch 'master' into id-remap

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



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

diff --cc source/blender/blenloader/BLO_readfile.h
index cb06b5d,bf47682..c85cf12
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@@ -100,11 -100,10 +100,11 @@@ struct ID *BLO_library_link_named_part(
  struct ID *BLO_library_link_named_part_ex(
          struct Main *mainl, BlendHandle **bh,
          const short idcode, const char *name, const short flag,
 -        struct Scene *scene, struct View3D *v3d);
 +        struct Scene *scene, struct View3D *v3d,
 +        const bool use_placeholders, const bool force_indirect);
  void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct View3D *v3d);
  
- void BLO_library_link_all(struct Main *mainl, BlendHandle *bh);
+ void BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh);
  
  void *BLO_library_read_struct(struct FileData *fd, struct BHead *bh, const char *blockname);
  
diff --cc source/blender/blenloader/intern/readfile.c
index 68c55f6,505c236..2432e93
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9693,37 -9738,12 +9744,12 @@@ void BLO_library_link_copypaste(Main *m
  
  static ID *link_named_part_ex(
          Main *mainl, FileData *fd, const short idcode, const char *name, const short flag,
 -		Scene *scene, View3D *v3d)
 +		Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect)
  {
 -	ID *id = link_named_part(mainl, fd, idcode, name);
 +	ID *id = link_named_part(mainl, fd, idcode, name, use_placeholders, force_indirect);
  
  	if (id && (GS(id->name) == ID_OB)) {	/* loose object: give a base */
- 		if (scene) {
- 			Base *base;
- 			Object *ob;
- 
- 			base = MEM_callocN(sizeof(Base), "app_nam_part");
- 			BLI_addtail(&scene->base, base);
- 
- 			ob = (Object *)id;
- 
- 			/* link at active layer (view3d if available in context, else scene one */
- 			if (flag & FILE_ACTIVELAY) {
- 				ob->lay = BKE_screen_view3d_layer_active(v3d, scene);
- 			}
- 
- 			ob->mode = OB_MODE_OBJECT;
- 			base->lay = ob->lay;
- 			base->object = ob;
- 			base->flag = ob->flag;
- 			ob->id.us++;
- 
- 			if (flag & FILE_AUTOSELECT) {
- 				base->flag |= SELECT;
- 				base->object->flag = base->flag;
- 				/* do NOT make base active here! screws up GUI stuff, if you want it do it on src/ level */
- 			}
- 		}
+ 		link_object_postprocess(id, scene, v3d, flag);
  	}
  	else if (id && (GS(id->name) == ID_GR)) {
  		/* tag as needing to be instantiated */