[Bf-blender-cvs] [32acaf1] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 32acaf1bc5c5fc25cfafce490868a066869ed8ec
Author: Antony Riakiotakis
Date:   Fri Jan 9 13:28:15 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB32acaf1bc5c5fc25cfafce490868a066869ed8ec

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/blenkernel/intern/mesh.c
index e5e1067,c47d294..1b33881
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@@ -560,8 -560,12 +560,12 @@@ Mesh *BKE_mesh_copy_ex(Main *bmain, Mes
  	men->bb = MEM_dupallocN(men->bb);
  	
  	men->key = BKE_key_copy(me->key);
 -	if (men->key) men->key->from = (ID *)men;
 +	BKE_key_set_from_id(men->key, (ID *)men);
  
+ 	if (me->id.lib) {
+ 		BKE_id_lib_local_paths(bmain, me->id.lib, &men->id);
+ 	}
+ 
  	return men;
  }