[Bf-blender-cvs] [74ac2be] id-remap: Again, fix for stupid broken relinking of Objects...
Bastien Montagne
noreply at git.blender.org
Thu Oct 8 13:07:39 CEST 2015
Commit: 74ac2beba2a44c5dec1268cca8cc0e8fd748adc6
Author: Bastien Montagne
Date: Thu Oct 8 13:07:06 2015 +0200
Branches: id-remap
https://developer.blender.org/rB74ac2beba2a44c5dec1268cca8cc0e8fd748adc6
Again, fix for stupid broken relinking of Objects...
===================================================================
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index d2bf1ad..a2a2156 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1150,7 +1150,7 @@ void BKE_libblock_remap_locked(Main *bmain, void *old_idv, void *new_idv, const
/* Some pre-processing.
* This is a bit ugly, but cannot see a way to avoid it...
*/
- if (GS(old_id->name) == ID_OB) {
+ if ((GS(old_id->name) == ID_OB) && (new_id == NULL)) {
Object *old_ob = (Object *)old_id;
Scene *sce;
Base *base;
More information about the Bf-blender-cvs
mailing list