[Bf-blender-cvs] [a0f5f3116a4] temp-eeveelightcache: Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

[Clément Foucault]

Commit: a0f5f3116a422d814b65e4682502a506e8a77ed6
Author: Clément Foucault
Date:   Mon Jun 18 11:20:59 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rBa0f5f3116a422d814b65e4682502a506e8a77ed6

Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

# Conflicts:
#	source/blender/blenloader/intern/readblenentry.c

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



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

diff --cc source/blender/blenloader/intern/readblenentry.c
index db51e5ba486,4ccdbd9e8e1..07d7f38fab6
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@@ -401,20 -398,17 +401,20 @@@ BlendFileData *BLO_read_from_memfile
  
  		/* make lookups of existing sound data in old main */
  		blo_make_sound_pointer_map(fd, oldmain);
- 		
+ 
  		/* removed packed data from this trick - it's internal data that needs saves */
- 		
+ 
  		bfd = blo_read_file_internal(fd, filename);
  
 +		/* ensures relinked light caches are not freed */
 +		blo_end_scene_pointer_map(fd, oldmain);
 +
  		/* ensures relinked images are not freed */
  		blo_end_image_pointer_map(fd, oldmain);
- 		
+ 
  		/* ensures relinked movie clips are not freed */
  		blo_end_movieclip_pointer_map(fd, oldmain);
- 		
+ 
  		/* ensures relinked sounds are not freed */
  		blo_end_sound_pointer_map(fd, oldmain);
  
diff --cc source/blender/blenloader/intern/readfile.h
index bb1f0ef4d7b,65938c88192..32349714061
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@@ -90,10 -90,9 +90,10 @@@ typedef struct FileData 
  	struct OldNewMap *libmap;
  	struct OldNewMap *imamap;
  	struct OldNewMap *movieclipmap;
 +	struct OldNewMap *scenemap;
  	struct OldNewMap *soundmap;
  	struct OldNewMap *packedmap;
- 	
+ 
  	struct BHeadSort *bheadmap;
  	int tot_bheadmap;