[Bf-blender-cvs] [387b120] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 387b1205791f5c38d00488b458c7559530f2d61b
Author: Bastien Montagne
Date:   Thu Nov 19 22:39:11 2015 +0100
Branches: id-remap
https://developer.blender.org/rB387b1205791f5c38d00488b458c7559530f2d61b

Merge branch 'master' into id-remap

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

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index c9315d2,39df407..bcb96aa
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9799,7 -9800,7 +9809,7 @@@ static void link_id_part(ReportList *re
  
  		/* Generate a placeholder for this ID (simplified version of read_libblock actually...). */
  		if (r_id) {
- 			*r_id = create_placeholder(mainvar, GS(id->name), id->name + 2, id->flag);
 -			*r_id = is_valid ? create_placeholder(mainvar, id->name, id->flag) : NULL;
++			*r_id = is_valid ? create_placeholder(mainvar, GS(id->name), id->name + 2, id->flag) : NULL;
  		}
  	}
  }