[Bf-blender-cvs] [18f87c8] id-remap: Merge branch 'master' into id-remap

Bastien Montagne noreply at git.blender.org
Tue Jun 7 09:31:54 CEST 2016


Commit: 18f87c8dcb6e6f001eaa2c18ca7206b907a5d3c2
Author: Bastien Montagne
Date:   Tue Jun 7 09:27:56 2016 +0200
Branches: id-remap
https://developer.blender.org/rB18f87c8dcb6e6f001eaa2c18ca7206b907a5d3c2

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 773ebb1,fd105f6..b861688
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9648,16 -9650,16 +9654,16 @@@ static void give_base_to_groups
  	}
  }
  
- static ID *create_placeholder(Main *mainvar, const short idcode, const char *idname, const short flag)
 -static ID *create_placeholder(Main *mainvar, const char *idname, const short tag)
++static ID *create_placeholder(Main *mainvar, const short idcode, const char *idname, const short tag)
  {
 -	const short idcode = GS(idname);
  	ListBase *lb = which_libbase(mainvar, idcode);
  	ID *ph_id = BKE_libblock_alloc_notest(idcode);
  
 -	memcpy(ph_id->name, idname, sizeof(ph_id->name));
 +	*((short *)ph_id->name) = idcode;
 +	BLI_strncpy(ph_id->name + 2, idname, sizeof(ph_id->name) - 2);
  	BKE_libblock_init_empty(ph_id);
  	ph_id->lib = mainvar->curlib;
- 	ph_id->tag = flag | LIB_TAG_MISSING;
+ 	ph_id->tag = tag | LIB_TAG_MISSING;
  	ph_id->us = ID_FAKE_USERS(ph_id);
  	ph_id->icon_id = 0;




More information about the Bf-blender-cvs mailing list