[Bf-blender-cvs] [dd1211e] strand_editmode: Merge branch 'master' into strand_editmode

[Lukas Tönne]

Commit: dd1211ecb8b370fcdc47822f61ce6b6210c500ff
Author: Lukas Tönne
Date:   Tue Jul 19 10:32:23 2016 +0200
Branches: strand_editmode
https://developer.blender.org/rBdd1211ecb8b370fcdc47822f61ce6b6210c500ff

Merge branch 'master' into strand_editmode

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 0de2c35,ba783e0..55e8f2b
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2266,10 -2266,9 +2266,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.