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

[Lukas Tönne]

Commit: e226318e039889e35d67090a1dd602c8b501099d
Author: Lukas Tönne
Date:   Tue Jul 19 10:32:35 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rBe226318e039889e35d67090a1dd602c8b501099d

Merge branch 'master' into strand_gpu

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 6389892,ba783e0..66b4d2f
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2292,10 -2266,9 +2292,10 @@@ static void write_meshes(WriteData *wd
  				CustomData_reset(&mesh->pdata);
  				CustomData_reset(&mesh->ldata);
  				mesh->edit_btmesh = NULL;
 +				mesh->edit_strands = NULL;
  
  				/* now fill in polys to mfaces */
- 				/* XXX This breaks writing desing, by using temp allocated memory, which will likely generate
+ 				/* XXX This breaks writing design, by using temp allocated memory, which will likely generate
  				 *     duplicates in stored 'old' addresses.
  				 *     This is very bad, but do not see easy way to avoid this, aside from generating those data
  				 *     outside of save process itself.