[Bf-blender-cvs] [a152743ba31] master: Fix T52314: New ID copy code (rBrB9da7dfa1586d) Breaks node previews in compositor.

Bastien Montagne noreply at git.blender.org
Thu Aug 10 11:13:05 CEST 2017


Commit: a152743ba31d8307efe70b6024fa81212b597362
Author: Bastien Montagne
Date:   Thu Aug 10 10:26:22 2017 +0200
Branches: master
https://developer.blender.org/rBa152743ba31d8307efe70b6024fa81212b597362

Fix T52314: New ID copy code (rBrB9da7dfa1586d) Breaks node previews in compositor.

"Just" forgot to copy data block's name in 'NO_MAIN' case... *sigh*

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

M	source/blender/blenkernel/intern/library.c

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 8bc6465d98e..0ccf67e7f8e 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1132,6 +1132,9 @@ void *BKE_libblock_alloc(Main *bmain, short type, const char *name, const int fl
 				DAG_id_type_tag(bmain, type);
 			}
 		}
+		else {
+			BLI_strncpy(id->name + 2, name, sizeof(id->name) - 2);
+		}
 	}
 
 	return id;




More information about the Bf-blender-cvs mailing list