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

[Bastien Montagne]

Commit: e9484fa25edb8af09ecc8436b218ceaa0dcd8e3f
Author: Bastien Montagne
Date:   Wed Feb 11 17:32:41 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBe9484fa25edb8af09ecc8436b218ceaa0dcd8e3f

Merge branch 'master' into asset-experiments

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 5727db9,6031400..7aa95aa
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3075,10 -3079,8 +3085,10 @@@ static void write_brushes(WriteData *wd
  			
  			if (brush->curve)
  				write_curvemapping(wd, brush->curve);
- 			if (brush->curve)
+ 			if (brush->gradient)
  				writestruct(wd, DATA, "ColorBand", 1, brush->gradient);
 +
 +			write_previews(wd, brush->preview);
  		}
  	}
  }