[Bf-blender-cvs] [d35bbc2] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: d35bbc2a157570d09b83d976da5e94b1ee18f6f6
Author: Bastien Montagne
Date:   Sat Jan 10 10:18:23 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBd35bbc2a157570d09b83d976da5e94b1ee18f6f6

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/blenkernel/intern/group.c
	source/blender/blenkernel/intern/object.c

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



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

diff --cc source/blender/blenkernel/intern/group.c
index bd91d9d,1f9cf2e..da652d8
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@@ -155,10 -149,10 +155,14 @@@ Group *BKE_group_copy(Group *group
  	groupn = BKE_libblock_copy(&group->id);
  	BLI_duplicatelist(&groupn->gobject, &group->gobject);
  
 +	if (group->preview) {
 +		groupn->preview = BKE_previewimg_copy(group->preview);
 +	}
 +
+ 	if (group->id.lib) {
+ 		BKE_id_lib_local_paths(G.main, group->id.lib, &groupn->id);
+ 	}
+ 
  	return groupn;
  }
  
diff --cc source/blender/blenkernel/intern/object.c
index 46518a5,a9292ac..bf02cbb
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -1522,10 -1518,10 +1522,14 @@@ Object *BKE_object_copy_ex(Main *bmain
  	/* Copy runtime surve data. */
  	obn->curve_cache = NULL;
  
+ 	if (ob->id.lib) {
+ 		BKE_id_lib_local_paths(bmain, ob->id.lib, &obn->id);
+ 	}
+ 
 +	if (ob->preview) {
 +		obn->preview = BKE_previewimg_copy(ob->preview);
 +	}
 +
  	return obn;
  }