[Bf-blender-cvs] [12e3347] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 12e3347a5a405c72dd7747774878f6d1ee085b73
Author: Bastien Montagne
Date:   Wed Dec 17 10:42:52 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB12e3347a5a405c72dd7747774878f6d1ee085b73

Merge branch 'master' into asset-experiments

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

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 286bc85,bf82a4f..baea69f
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2085,6 -2055,32 +2085,35 @@@ static void write_lattices(WriteData *w
  	}
  }
  
++<<<<<<< HEAD
++=======
+ static void write_previews(WriteData *wd, PreviewImage *prv)
+ {
+ 	/* Never write previews in undo steps! */
+ 	if (prv && !wd->current) {
+ 		short w = prv->w[1];
+ 		short h = prv->h[1];
+ 		unsigned int *rect = prv->rect[1];
+ 		/* don't write out large previews if not requested */
+ 		if (!(U.flag & USER_SAVE_PREVIEWS)) {
+ 			prv->w[1] = 0;
+ 			prv->h[1] = 0;
+ 			prv->rect[1] = NULL;
+ 		}
+ 		writestruct(wd, DATA, "PreviewImage", 1, prv);
+ 		if (prv->rect[0]) writedata(wd, DATA, prv->w[0]*prv->h[0]*sizeof(unsigned int), prv->rect[0]);
+ 		if (prv->rect[1]) writedata(wd, DATA, prv->w[1]*prv->h[1]*sizeof(unsigned int), prv->rect[1]);
+ 
+ 		/* restore preview, we still want to keep it in memory even if not saved to file */
+ 		if (!(U.flag & USER_SAVE_PREVIEWS) ) {
+ 			prv->w[1] = w;
+ 			prv->h[1] = h;
+ 			prv->rect[1] = rect;
+ 		}
+ 	}
+ }
+ 
++>>>>>>> master
  static void write_images(WriteData *wd, ListBase *idbase)
  {
  	Image *ima;