[Bf-blender-cvs] [06eb69b] missing-libs: Correct handling of name in placeholder generator (this is a name, not an idname...).

[Bastien Montagne]

Commit: 06eb69b892941f532681c731a410487ee73f574a
Author: Bastien Montagne
Date:   Mon Sep 21 21:37:05 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB06eb69b892941f532681c731a410487ee73f574a

Correct handling of name in placeholder generator (this is a name, not an idname...).

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index dee8c54..22e6a66 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9568,7 +9568,8 @@ static ID *create_placeholder(Main *mainvar, const short idcode, const char *nam
 	ListBase *lb = which_libbase(mainvar, idcode);
 	ID *ph_id = BKE_libblock_alloc_notest(idcode);
 
-	memcpy(ph_id->name, name, sizeof(ph_id->name));
+	*((short *)ph_id->name) = idcode;
+	memcpy(ph_id->name + 2, name, sizeof(ph_id->name) - 2);
 	BKE_libblock_init_empty(ph_id);
 	ph_id->lib = mainvar->curlib;
 	ph_id->flag = flag | LIB_MISSING;
@@ -9724,7 +9725,7 @@ static void link_id_part(ReportList *reports, FileData *fd, Main *mainvar, ID *i
 
 		/* Generate a placeholder for this ID (limited version of read_libblock actually...). */
 		if (r_id) {
-			*r_id = create_placeholder(mainvar, GS(id->name), id->name, id->flag);
+			*r_id = create_placeholder(mainvar, GS(id->name), id->name + 2, id->flag);
 		}
 	}
 }