[Bf-blender-cvs] [01791b6] strand_gpu: Merge branch 'master' into strand_gpu

[Lukas Tönne]

Commit: 01791b69563f37e349afe583b501cc01eb1c5514
Author: Lukas Tönne
Date:   Tue Jul 5 09:58:41 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rB01791b69563f37e349afe583b501cc01eb1c5514

Merge branch 'master' into strand_gpu

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index c4219b7,19fb80f..9072170
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1253,21 -1389,6 +1390,21 @@@ static void write_particlesystems(Write
  	}
  }
  
 +static void write_strands(WriteData *wd, Strands *strands)
 +{
 +	if (strands == NULL)
 +		return;
 +	
- 	writestruct(wd, DATA, "Strands", 1, strands);
++	writestruct(wd, DATA, Strands, 1, strands);
 +	
 +	if (strands->curves) {
- 		writestruct(wd, DATA, "StrandCurve", strands->totcurves, strands->curves);
++		writestruct(wd, DATA, StrandCurve, strands->totcurves, strands->curves);
 +	}
 +	if (strands->verts) {
- 		writestruct(wd, DATA, "StrandVertex", strands->totverts, strands->verts);
++		writestruct(wd, DATA, StrandVertex, strands->totverts, strands->verts);
 +	}
 +}
 +
  static void write_properties(WriteData *wd, ListBase *lb)
  {
  	bProperty *prop;
@@@ -1684,16 -1823,6 +1839,16 @@@ static void write_modifiers(WriteData *
  				writedata(wd, DATA, sizeof(float[3]) * csmd->bind_coords_num, csmd->bind_coords);
  			}
  		}
 +		else if (md->type == eModifierType_Strands) {
 +			StrandsModifierData *smd = (StrandsModifierData *)md;
 +
 +			if (smd->strands) {
 +				write_strands(wd, smd->strands);
 +			}
 +			if (smd->roots) {
- 				writestruct(wd, DATA, "StrandRoot", smd->num_roots, smd->roots);
++				writestruct(wd, DATA, StrandRoot, smd->num_roots, smd->roots);
 +			}
 +		}
  	}
  }