Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

1 files changed, 22 insertions, 18 deletions

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 3393be059bd..194ad72100c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -29,15 +29,22 @@
  */
 
 
-/*
- * FILEFORMAT: IFF-style structure  (but not IFF compatible!)
+/**
+ *
+ * FILE FORMAT
+ * ===========
+ *
+ * IFF-style structure  (but not IFF compatible!)
  *
  * start file:
+ * <pre>
  *     BLENDER_V100    12 bytes  (versie 1.00)
  *                     V = big endian, v = little endian
  *                     _ = 4 byte pointer, - = 8 byte pointer
+ * </pre>
  *
- * datablocks:     also see struct BHead
+ * datablocks: (also see struct #BHead).
+ * <pre>
  *     <bh.code>           4 chars
  *     <bh.len>            int,  len data after BHead
  *     <bh.old>            void,  old pointer
@@ -46,29 +53,32 @@
  *     data
  *     ...
  *     ...
+ * </pre>
  *
  * Almost all data in Blender are structures. Each struct saved
  * gets a BHead header.  With BHead the struct can be linked again
  * and compared with StructDNA .
  *
+ *
  * WRITE
+ * =====
  *
  * Preferred writing order: (not really a must, but why would you do it random?)
  * Any case: direct data is ALWAYS after the lib block
  *
  * (Local file data)
  * - for each LibBlock
- *     - write LibBlock
- *     - write associated direct data
+ *   - write LibBlock
+ *   - write associated direct data
  * (External file data)
  * - per library
- *     - write library block
- *     - per LibBlock
- *         - write the ID of LibBlock
- * - write TEST (128x128, blend file preview, optional)
- * - write FileGlobal (some global vars)
- * - write SDNA
- * - write USER if filename is ~/X.XX/config/startup.blend
+ *   - write library block
+ *   - per LibBlock
+ *     - write the ID of LibBlock
+ * - write #TEST (#RenderInfo struct. 128x128 blend file preview is optional).
+ * - write #GLOB (#FileGlobal struct) (some global vars).
+ * - write #DNA1 (#SDNA struct)
+ * - write #USER (#UserDef struct) if filename is ``~/X.XX/config/startup.blend``.
  */
 
 
@@ -309,12 +319,6 @@ static WriteData *writedata_new(WriteWrap *ww)
 {
 	WriteData *wd= MEM_callocN(sizeof(*wd), "writedata");
 
-		/* XXX, see note about this in readfile.c, remove
-		 * once we have an xp lock - zr
-		 */
-
-	if (wd == NULL) return NULL;
-
 	wd->sdna = DNA_sdna_from_data(DNAstr, DNAlen, false);
 
 	wd->ww = ww;