ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 3311 insertions, 3292 deletions

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index e0746c7c3dd..79cd7678f90 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -21,7 +21,6 @@
  * \ingroup blenloader
  */
 
-
 /**
  *
  * FILE FORMAT
@@ -72,7 +71,6 @@
  * - write #USER (#UserDef struct) if filename is ``~/.config/blender/X.XX/config/startup.blend``.
  */
 
-
 #include <math.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -81,12 +79,12 @@
 #include <stdlib.h>
 
 #ifdef WIN32
-#  include <zlib.h>  /* odd include order-issue */
+#  include <zlib.h> /* odd include order-issue */
 #  include "winsock2.h"
 #  include <io.h>
 #  include "BLI_winstuff.h"
 #else
-#  include <unistd.h>  /* FreeBSD, for write() and close(). */
+#  include <unistd.h> /* FreeBSD, for write() and close(). */
 #endif
 
 #include "BLI_utildefines.h"
@@ -141,7 +139,7 @@
 #include "DNA_movieclip_types.h"
 #include "DNA_mask_types.h"
 
-#include "MEM_guardedalloc.h" // MEM_freeN
+#include "MEM_guardedalloc.h"  // MEM_freeN
 #include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
 #include "BLI_mempool.h"
@@ -153,7 +151,7 @@
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
 #include "BKE_fcurve.h"
-#include "BKE_global.h" // for G
+#include "BKE_global.h"  // for G
 #include "BKE_gpencil_modifier.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
@@ -170,10 +168,9 @@
 #include "BKE_workspace.h"
 
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-#include "NOD_socket.h"  /* for sock->default_value data */
+#  include "NOD_socket.h" /* for sock->default_value data */
 #endif
 
-
 #include "BLO_blend_defs.h"
 #include "BLO_blend_validate.h"
 #include "BLO_readfile.h"
@@ -190,8 +187,8 @@
 /* ********* my write, buffered writing with minimum size chunks ************ */
 
 /* Use optimal allocation since blocks of this size are kept in memory for undo. */
-#define MYWRITE_BUFFER_SIZE (MEM_SIZE_OPTIMAL(1 << 17))  /* 128kb */
-#define MYWRITE_MAX_CHUNK   (MEM_SIZE_OPTIMAL(1 << 15))  /* ~32kb */
+#define MYWRITE_BUFFER_SIZE (MEM_SIZE_OPTIMAL(1 << 17)) /* 128kb */
+#define MYWRITE_MAX_CHUNK (MEM_SIZE_OPTIMAL(1 << 15))   /* ~32kb */
 
 /** Use if we want to store how many bytes have been written to the file. */
 // #define USE_WRITE_DATA_LEN
@@ -201,80 +198,78 @@
  * \{ */
 
 typedef enum {
-	WW_WRAP_NONE = 1,
-	WW_WRAP_ZLIB,
+  WW_WRAP_NONE = 1,
+  WW_WRAP_ZLIB,
 } eWriteWrapType;
 
 typedef struct WriteWrap WriteWrap;
 struct WriteWrap {
-	/* callbacks */
-	bool   (*open)(WriteWrap *ww, const char *filepath);
-	bool   (*close)(WriteWrap *ww);
-	size_t (*write)(WriteWrap *ww, const char *data, size_t data_len);
-
-	/* Buffer output (we only want when output isn't already buffered). */
-	bool use_buf;
-
-	/* internal */
-	union {
-		int file_handle;
-		gzFile gz_handle;
-	} _user_data;
+  /* callbacks */
+  bool (*open)(WriteWrap *ww, const char *filepath);
+  bool (*close)(WriteWrap *ww);
+  size_t (*write)(WriteWrap *ww, const char *data, size_t data_len);
+
+  /* Buffer output (we only want when output isn't already buffered). */
+  bool use_buf;
+
+  /* internal */
+  union {
+    int file_handle;
+    gzFile gz_handle;
+  } _user_data;
 };
 
 /* none */
-#define FILE_HANDLE(ww) \
-	(ww)->_user_data.file_handle
+#define FILE_HANDLE(ww) (ww)->_user_data.file_handle
 
 static bool ww_open_none(WriteWrap *ww, const char *filepath)
 {
-	int file;
+  int file;
 
-	file = BLI_open(filepath, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
+  file = BLI_open(filepath, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
 
-	if (file != -1) {
-		FILE_HANDLE(ww) = file;
-		return true;
-	}
-	else {
-		return false;
-	}
+  if (file != -1) {
+    FILE_HANDLE(ww) = file;
+    return true;
+  }
+  else {
+    return false;
+  }
 }
 static bool ww_close_none(WriteWrap *ww)
 {
-	return (close(FILE_HANDLE(ww)) != -1);
+  return (close(FILE_HANDLE(ww)) != -1);
 }
 static size_t ww_write_none(WriteWrap *ww, const char *buf, size_t buf_len)
 {
-	return write(FILE_HANDLE(ww), buf, buf_len);
+  return write(FILE_HANDLE(ww), buf, buf_len);
 }
 #undef FILE_HANDLE
 
 /* zlib */
-#define FILE_HANDLE(ww) \
-	(ww)->_user_data.gz_handle
+#define FILE_HANDLE(ww) (ww)->_user_data.gz_handle
 
 static bool ww_open_zlib(WriteWrap *ww, const char *filepath)
 {
-	gzFile file;
+  gzFile file;
 
-	file = BLI_gzopen(filepath, "wb1");
+  file = BLI_gzopen(filepath, "wb1");
 
-	if (file != Z_NULL) {
-		FILE_HANDLE(ww) = file;
-		return true;
-	}
-	else {
-		return false;
-	}
+  if (file != Z_NULL) {
+    FILE_HANDLE(ww) = file;
+    return true;
+  }
+  else {
+    return false;
+  }
 }
 static bool ww_close_zlib(WriteWrap *ww)
 {
-	return (gzclose(FILE_HANDLE(ww)) == Z_OK);
+  return (gzclose(FILE_HANDLE(ww)) == Z_OK);
 }
 static size_t ww_write_zlib(WriteWrap *ww, const char *buf, size_t buf_len)
 {
-	return gzwrite(FILE_HANDLE(ww), buf, buf_len);
+  return gzwrite(FILE_HANDLE(ww), buf, buf_len);
 }
 #undef FILE_HANDLE
 
@@ -282,26 +277,24 @@ static size_t ww_write_zlib(WriteWrap *ww, const char *buf, size_t buf_len)
 
 static void ww_handle_init(eWriteWrapType ww_type, WriteWrap *r_ww)
 {
-	memset(r_ww, 0, sizeof(*r_ww));
-
-	switch (ww_type) {
-		case WW_WRAP_ZLIB:
-		{
-			r_ww->open  = ww_open_zlib;
-			r_ww->close = ww_close_zlib;
-			r_ww->write = ww_write_zlib;
-			r_ww->use_buf = false;
-			break;
-		}
-		default:
-		{
-			r_ww->open  = ww_open_none;
-			r_ww->close = ww_close_none;
-			r_ww->write = ww_write_none;
-			r_ww->use_buf = true;
-			break;
-		}
-	}
+  memset(r_ww, 0, sizeof(*r_ww));
+
+  switch (ww_type) {
+    case WW_WRAP_ZLIB: {
+      r_ww->open = ww_open_zlib;
+      r_ww->close = ww_close_zlib;
+      r_ww->write = ww_write_zlib;
+      r_ww->use_buf = false;
+      break;
+    }
+    default: {
+      r_ww->open = ww_open_none;
+      r_ww->close = ww_close_none;
+      r_ww->write = ww_write_none;
+      r_ww->use_buf = true;
+      break;
+    }
+  }
 }
 
 /** \} */
@@ -311,81 +304,81 @@ static void ww_handle_init(eWriteWrapType ww_type, WriteWrap *r_ww)
  * \{ */
 
 typedef struct {
-	const struct SDNA *sdna;
+  const struct SDNA *sdna;
 
-	/** Use for file and memory writing (fixed size of #MYWRITE_BUFFER_SIZE). */
-	uchar *buf;
-	/** Number of bytes used in #WriteData.buf (flushed when exceeded). */
-	int buf_used_len;
+  /** Use for file and memory writing (fixed size of #MYWRITE_BUFFER_SIZE). */
+  uchar *buf;
+  /** Number of bytes used in #WriteData.buf (flushed when exceeded). */
+  int buf_used_len;
 
 #ifdef USE_WRITE_DATA_LEN
-	/** Total number of bytes written. */
-	size_t write_len;
+  /** Total number of bytes written. */
+  size_t write_len;
 #endif
 
-	/** Set on unlikely case of an error (ignores further file writing).  */
-	bool error;
-
-	/** #MemFile writing (used for undo). */
-	struct {
-		MemFile      *current;
-		MemFile      *compare;
-		/** Use to de-duplicate chunks when writing. */
-		MemFileChunk *compare_chunk;
-	} mem;
-	/** When true, write to #WriteData.current, could also call 'is_undo'. */
-	bool use_memfile;
-
-	/**
-	 * Wrap writing, so we can use zlib or
-	 * other compression types later, see: G_FILE_COMPRESS
-	 * Will be NULL for UNDO.
-	 */
-	WriteWrap *ww;
+  /** Set on unlikely case of an error (ignores further file writing).  */
+  bool error;
+
+  /** #MemFile writing (used for undo). */
+  struct {
+    MemFile *current;
+    MemFile *compare;
+    /** Use to de-duplicate chunks when writing. */
+    MemFileChunk *compare_chunk;
+  } mem;
+  /** When true, write to #WriteData.current, could also call 'is_undo'. */
+  bool use_memfile;
+
+  /**
+   * Wrap writing, so we can use zlib or
+   * other compression types later, see: G_FILE_COMPRESS
+   * Will be NULL for UNDO.
+   */
+  WriteWrap *ww;
 } WriteData;
 
 static WriteData *writedata_new(WriteWrap *ww)
 {
-	WriteData *wd = MEM_callocN(sizeof(*wd), "writedata");
+  WriteData *wd = MEM_callocN(sizeof(*wd), "writedata");
 
-	wd->sdna = DNA_sdna_current_get();
+  wd->sdna = DNA_sdna_current_get();
 
-	wd->ww = ww;
+  wd->ww = ww;
 
-	if ((ww == NULL) || (ww->use_buf)) {
-		wd->buf = MEM_mallocN(MYWRITE_BUFFER_SIZE, "wd->buf");
-	}
+  if ((ww == NULL) || (ww->use_buf)) {
+    wd->buf = MEM_mallocN(MYWRITE_BUFFER_SIZE, "wd->buf");
+  }
 
-	return wd;
+  return wd;
 }
 
 static void writedata_do_write(WriteData *wd, const void *mem, int memlen)
 {
-	if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) {
-		return;
-	}
-
-	if (UNLIKELY(wd->error)) {
-		return;
-	}
-
-	/* memory based save */
-	if (wd->use_memfile) {
-		memfile_chunk_add(wd->mem.current, mem, memlen, &wd->mem.compare_chunk);
-	}
-	else {
-		if (wd->ww->write(wd->ww, mem, memlen) != memlen) {
-			wd->error = true;
-		}
-	}
+  if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) {
+    return;
+  }
+
+  if (UNLIKELY(wd->error)) {
+    return;
+  }
+
+  /* memory based save */
+  if (wd->use_memfile) {
+    memfile_chunk_add(wd->mem.current, mem, memlen, &wd->mem.compare_chunk);
+  }
+  else {
+    if (wd->ww->write(wd->ww, mem, memlen) != memlen) {
+      wd->error = true;
+    }
+  }
 }
 
 static void writedata_free(WriteData *wd)
 {
-	if (wd->buf) {
-		MEM_freeN(wd->buf);
-	}
-	MEM_freeN(wd);
+  if (wd->buf) {
+    MEM_freeN(wd->buf);
+  }
+  MEM_freeN(wd);
 }
 
 /** \} */
@@ -400,10 +393,10 @@ static void writedata_free(WriteData *wd)
  */
 static void mywrite_flush(WriteData *wd)
 {
-	if (wd->buf_used_len) {
-		writedata_do_write(wd, wd->buf, wd->buf_used_len);
-		wd->buf_used_len = 0;
-	}
+  if (wd->buf_used_len) {
+    writedata_do_write(wd, wd->buf, wd->buf_used_len);
+    wd->buf_used_len = 0;
+  }
 }
 
 /**
@@ -413,51 +406,51 @@ static void mywrite_flush(WriteData *wd)
  */
 static void mywrite(WriteData *wd, const void *adr, int len)
 {
-	if (UNLIKELY(wd->error)) {
-		return;
-	}
+  if (UNLIKELY(wd->error)) {
+    return;
+  }
 
-	if (UNLIKELY(adr == NULL)) {
-		BLI_assert(0);
-		return;
-	}
+  if (UNLIKELY(adr == NULL)) {
+    BLI_assert(0);
+    return;
+  }
 
 #ifdef USE_WRITE_DATA_LEN
-	wd->write_len += len;
+  wd->write_len += len;
 #endif
 
-	if (wd->buf == NULL) {
-		writedata_do_write(wd, adr, len);
-	}
-	else {
-		/* if we have a single big chunk, write existing data in
-		 * buffer and write out big chunk in smaller pieces */
-		if (len > MYWRITE_MAX_CHUNK) {
-			if (wd->buf_used_len) {
-				writedata_do_write(wd, wd->buf, wd->buf_used_len);
-				wd->buf_used_len = 0;
-			}
-
-			do {
-				int writelen = MIN2(len, MYWRITE_MAX_CHUNK);
-				writedata_do_write(wd, adr, writelen);
-				adr = (const char *)adr + writelen;
-				len -= writelen;
-			} while (len > 0);
-
-			return;
-		}
-
-		/* if data would overflow buffer, write out the buffer */
-		if (len + wd->buf_used_len > MYWRITE_BUFFER_SIZE - 1) {
-			writedata_do_write(wd, wd->buf, wd->buf_used_len);
-			wd->buf_used_len = 0;
-		}
-
-		/* append data at end of buffer */
-		memcpy(&wd->buf[wd->buf_used_len], adr, len);
-		wd->buf_used_len += len;
-	}
+  if (wd->buf == NULL) {
+    writedata_do_write(wd, adr, len);
+  }
+  else {
+    /* if we have a single big chunk, write existing data in
+     * buffer and write out big chunk in smaller pieces */
+    if (len > MYWRITE_MAX_CHUNK) {
+      if (wd->buf_used_len) {
+        writedata_do_write(wd, wd->buf, wd->buf_used_len);
+        wd->buf_used_len = 0;
+      }
+
+      do {
+        int writelen = MIN2(len, MYWRITE_MAX_CHUNK);
+        writedata_do_write(wd, adr, writelen);
+        adr = (const char *)adr + writelen;
+        len -= writelen;
+      } while (len > 0);
+
+      return;
+    }
+
+    /* if data would overflow buffer, write out the buffer */
+    if (len + wd->buf_used_len > MYWRITE_BUFFER_SIZE - 1) {
+      writedata_do_write(wd, wd->buf, wd->buf_used_len);
+      wd->buf_used_len = 0;
+    }
+
+    /* append data at end of buffer */
+    memcpy(&wd->buf[wd->buf_used_len], adr, len);
+    wd->buf_used_len += len;
+  }
 }
 
 /**
@@ -469,16 +462,16 @@ static void mywrite(WriteData *wd, const void *adr, int len)
  */
 static WriteData *mywrite_begin(WriteWrap *ww, MemFile *compare, MemFile *current)
 {
-	WriteData *wd = writedata_new(ww);
+  WriteData *wd = writedata_new(ww);
 
-	if (current != NULL) {
-		wd->mem.current = current;
-		wd->mem.compare = compare;
-		wd->mem.compare_chunk = compare ? compare->chunks.first : NULL;
-		wd->use_memfile = true;
-	}
+  if (current != NULL) {
+    wd->mem.current = current;
+    wd->mem.compare = compare;
+    wd->mem.compare_chunk = compare ? compare->chunks.first : NULL;
+    wd->use_memfile = true;
+  }
 
-	return wd;
+  return wd;
 }
 
 /**
@@ -489,15 +482,15 @@ static WriteData *mywrite_begin(WriteWrap *ww, MemFile *compare, MemFile *curren
  */
 static bool mywrite_end(WriteData *wd)
 {
-	if (wd->buf_used_len) {
-		writedata_do_write(wd, wd->buf, wd->buf_used_len);
-		wd->buf_used_len = 0;
-	}
+  if (wd->buf_used_len) {
+    writedata_do_write(wd, wd->buf, wd->buf_used_len);
+    wd->buf_used_len = 0;
+  }
 
-	const bool err = wd->error;
-	writedata_free(wd);
+  const bool err = wd->error;
+  writedata_free(wd);
 
-	return err;
+  return err;
 }
 
 /** \} */
@@ -507,128 +500,127 @@ static bool mywrite_end(WriteData *wd)
  * \{ */
 
 static void writestruct_at_address_nr(
-        WriteData *wd, int filecode, const int struct_nr, int nr,
-        const void *adr, const void *data)
+    WriteData *wd, int filecode, const int struct_nr, int nr, const void *adr, const void *data)
 {
-	BHead bh;
-	const short *sp;
+  BHead bh;
+  const short *sp;
 
-	BLI_assert(struct_nr > 0 && struct_nr < SDNA_TYPE_MAX);
+  BLI_assert(struct_nr > 0 && struct_nr < SDNA_TYPE_MAX);
 
-	if (adr == NULL || data == NULL || nr == 0) {
-		return;
-	}
+  if (adr == NULL || data == NULL || nr == 0) {
+    return;
+  }
 
-	/* init BHead */
-	bh.code = filecode;
-	bh.old = adr;
-	bh.nr = nr;
+  /* init BHead */
+  bh.code = filecode;
+  bh.old = adr;
+  bh.nr = nr;
 
-	bh.SDNAnr = struct_nr;
-	sp = wd->sdna->structs[bh.SDNAnr];
+  bh.SDNAnr = struct_nr;
+  sp = wd->sdna->structs[bh.SDNAnr];
 
-	bh.len = nr * wd->sdna->types_size[sp[0]];
+  bh.len = nr * wd->sdna->types_size[sp[0]];
 
-	if (bh.len == 0) {
-		return;
-	}
+  if (bh.len == 0) {
+    return;
+  }
 
-	mywrite(wd, &bh, sizeof(BHead));
-	mywrite(wd, data, bh.len);
+  mywrite(wd, &bh, sizeof(BHead));
+  mywrite(wd, data, bh.len);
 }
 
 static void writestruct_at_address_id(
-        WriteData *wd, int filecode, const char *structname, int nr,
-        const void *adr, const void *data)
+    WriteData *wd, int filecode, const char *structname, int nr, const void *adr, const void *data)
 {
-	if (adr == NULL || data == NULL || nr == 0) {
-		return;
-	}
+  if (adr == NULL || data == NULL || nr == 0) {
+    return;
+  }
 
-	const int SDNAnr = DNA_struct_find_nr(wd->sdna, structname);
-	if (UNLIKELY(SDNAnr == -1)) {
-		printf("error: can't find SDNA code <%s>\n", structname);
-		return;
-	}
+  const int SDNAnr = DNA_struct_find_nr(wd->sdna, structname);
+  if (UNLIKELY(SDNAnr == -1)) {
+    printf("error: can't find SDNA code <%s>\n", structname);
+    return;
+  }
 
-	writestruct_at_address_nr(wd, filecode, SDNAnr, nr, adr, data);
+  writestruct_at_address_nr(wd, filecode, SDNAnr, nr, adr, data);
 }
 
 static void writestruct_nr(
-        WriteData *wd, int filecode, const int struct_nr, int nr,
-        const void *adr)
+    WriteData *wd, int filecode, const int struct_nr, int nr, const void *adr)
 {
-	writestruct_at_address_nr(wd, filecode, struct_nr, nr, adr, adr);
+  writestruct_at_address_nr(wd, filecode, struct_nr, nr, adr, adr);
 }
 
 static void writestruct_id(
-        WriteData *wd, int filecode, const char *structname, int nr,
-        const void *adr)
+    WriteData *wd, int filecode, const char *structname, int nr, const void *adr)
 {
-	writestruct_at_address_id(wd, filecode, structname, nr, adr, adr);
+  writestruct_at_address_id(wd, filecode, structname, nr, adr, adr);
 }
 
-static void writedata(WriteData *wd, int filecode, int len, const void *adr)  /* do not use for structs */
+static void writedata(WriteData *wd,
+                      int filecode,
+                      int len,
+                      const void *adr) /* do not use for structs */
 {
-	BHead bh;
+  BHead bh;
 
-	if (adr == NULL || len == 0) {
-		return;
-	}
+  if (adr == NULL || len == 0) {
+    return;
+  }
 
-	/* align to 4 (writes uninitialized bytes in some cases) */
-	len = (len + 3) & ~3;
+  /* align to 4 (writes uninitialized bytes in some cases) */
+  len = (len + 3) & ~3;
 
-	/* init BHead */
-	bh.code   = filecode;
-	bh.old    = adr;
-	bh.nr     = 1;
-	bh.SDNAnr = 0;
-	bh.len    = len;
+  /* init BHead */
+  bh.code = filecode;
+  bh.old = adr;
+  bh.nr = 1;
+  bh.SDNAnr = 0;
+  bh.len = len;
 
-	mywrite(wd, &bh, sizeof(BHead));
-	mywrite(wd, adr, len);
+  mywrite(wd, &bh, sizeof(BHead));
+  mywrite(wd, adr, len);
 }
 
 /* use this to force writing of lists in same order as reading (using link_list) */
 static void writelist_nr(WriteData *wd, int filecode, const int struct_nr, const ListBase *lb)
 {
-	const Link *link = lb->first;
+  const Link *link = lb->first;
 
-	while (link) {
-		writestruct_nr(wd, filecode, struct_nr, 1, link);
-		link = link->next;
-	}
+  while (link) {
+    writestruct_nr(wd, filecode, struct_nr, 1, link);
+    link = link->next;
+  }
 }
 
 #if 0
 static void writelist_id(WriteData *wd, int filecode, const char *structname, const ListBase *lb)
 {
-	const Link *link = lb->first;
-	if (link) {
-
-		const int struct_nr = DNA_struct_find_nr(wd->sdna, structname);
-		if (struct_nr == -1) {
-			printf("error: can't find SDNA code <%s>\n", structname);
-			return;
-		}
-
-		while (link) {
-			writestruct_nr(wd, filecode, struct_nr, 1, link);
-			link = link->next;
-		}
-	}
+  const Link *link = lb->first;
+  if (link) {
+
+    const int struct_nr = DNA_struct_find_nr(wd->sdna, structname);
+    if (struct_nr == -1) {
+      printf("error: can't find SDNA code <%s>\n", structname);
+      return;
+    }
+
+    while (link) {
+      writestruct_nr(wd, filecode, struct_nr, 1, link);
+      link = link->next;
+    }
+  }
 }
 #endif
 
 #define writestruct_at_address(wd, filecode, struct_id, nr, adr, data) \
-	writestruct_at_address_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), nr, adr, data)
+  writestruct_at_address_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), nr, adr, data)
 
 #define writestruct(wd, filecode, struct_id, nr, adr) \
-	writestruct_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), nr, adr)
+  writestruct_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), nr, adr)
 
 #define writelist(wd, filecode, struct_id, lb) \
-	writelist_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), lb)
+  writelist_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), lb)
 
 /** \} */
 
@@ -643,550 +635,550 @@ void IDP_WriteProperty(const IDProperty *prop, void *wd);
 
 static void IDP_WriteArray(const IDProperty *prop, void *wd)
 {
-	/*REMEMBER to set totalen to len in the linking code!!*/
-	if (prop->data.pointer) {
-		writedata(wd, DATA, MEM_allocN_len(prop->data.pointer), prop->data.pointer);
-
-		if (prop->subtype == IDP_GROUP) {
-			IDProperty **array = prop->data.pointer;
-			int a;
-
-			for (a = 0; a < prop->len; a++) {
-				IDP_WriteProperty(array[a], wd);
-			}
-		}
-	}
+  /*REMEMBER to set totalen to len in the linking code!!*/
+  if (prop->data.pointer) {
+    writedata(wd, DATA, MEM_allocN_len(prop->data.pointer), prop->data.pointer);
+
+    if (prop->subtype == IDP_GROUP) {
+      IDProperty **array = prop->data.pointer;
+      int a;
+
+      for (a = 0; a < prop->len; a++) {
+        IDP_WriteProperty(array[a], wd);
+      }
+    }
+  }
 }
 
 static void IDP_WriteIDPArray(const IDProperty *prop, void *wd)
 {
-	/*REMEMBER to set totalen to len in the linking code!!*/
-	if (prop->data.pointer) {
-		const IDProperty *array = prop->data.pointer;
-		int a;
+  /*REMEMBER to set totalen to len in the linking code!!*/
+  if (prop->data.pointer) {
+    const IDProperty *array = prop->data.pointer;
+    int a;
 
-		writestruct(wd, DATA, IDProperty, prop->len, array);
+    writestruct(wd, DATA, IDProperty, prop->len, array);
 
-		for (a = 0; a < prop->len; a++) {
-			IDP_WriteProperty_OnlyData(&array[a], wd);
-		}
-	}
+    for (a = 0; a < prop->len; a++) {
+      IDP_WriteProperty_OnlyData(&array[a], wd);
+    }
+  }
 }
 
 static void IDP_WriteString(const IDProperty *prop, void *wd)
 {
-	/*REMEMBER to set totalen to len in the linking code!!*/
-	writedata(wd, DATA, prop->len, prop->data.pointer);
+  /*REMEMBER to set totalen to len in the linking code!!*/
+  writedata(wd, DATA, prop->len, prop->data.pointer);
 }
 
 static void IDP_WriteGroup(const IDProperty *prop, void *wd)
 {
-	IDProperty *loop;
+  IDProperty *loop;
 
-	for (loop = prop->data.group.first; loop; loop = loop->next) {
-		IDP_WriteProperty(loop, wd);
-	}
+  for (loop = prop->data.group.first; loop; loop = loop->next) {
+    IDP_WriteProperty(loop, wd);
+  }
 }
 
 /* Functions to read/write ID Properties */
 void IDP_WriteProperty_OnlyData(const IDProperty *prop, void *wd)
 {
-	switch (prop->type) {
-		case IDP_GROUP:
-			IDP_WriteGroup(prop, wd);
-			break;
-		case IDP_STRING:
-			IDP_WriteString(prop, wd);
-			break;
-		case IDP_ARRAY:
-			IDP_WriteArray(prop, wd);
-			break;
-		case IDP_IDPARRAY:
-			IDP_WriteIDPArray(prop, wd);
-			break;
-	}
+  switch (prop->type) {
+    case IDP_GROUP:
+      IDP_WriteGroup(prop, wd);
+      break;
+    case IDP_STRING:
+      IDP_WriteString(prop, wd);
+      break;
+    case IDP_ARRAY:
+      IDP_WriteArray(prop, wd);
+      break;
+    case IDP_IDPARRAY:
+      IDP_WriteIDPArray(prop, wd);
+      break;
+  }
 }
 
 void IDP_WriteProperty(const IDProperty *prop, void *wd)
 {
-	writestruct(wd, DATA, IDProperty, 1, prop);
-	IDP_WriteProperty_OnlyData(prop, wd);
+  writestruct(wd, DATA, IDProperty, 1, prop);
+  IDP_WriteProperty_OnlyData(prop, wd);
 }
 
 static void write_iddata(void *wd, const ID *id)
 {
-	/* ID_WM's id->properties are considered runtime only, and never written in .blend file. */
-	if (id->properties && !ELEM(GS(id->name), ID_WM)) {
-		IDP_WriteProperty(id->properties, wd);
-	}
-
-	if (id->override_static) {
-		writestruct(wd, DATA, IDOverrideStatic, 1, id->override_static);
-
-		writelist(wd, DATA, IDOverrideStaticProperty, &id->override_static->properties);
-		for (IDOverrideStaticProperty *op = id->override_static->properties.first; op; op = op->next) {
-			writedata(wd, DATA, strlen(op->rna_path) + 1, op->rna_path);
-
-			writelist(wd, DATA, IDOverrideStaticPropertyOperation, &op->operations);
-			for (IDOverrideStaticPropertyOperation *opop = op->operations.first; opop; opop = opop->next) {
-				if (opop->subitem_reference_name) {
-					writedata(wd, DATA, strlen(opop->subitem_reference_name) + 1, opop->subitem_reference_name);
-				}
-				if (opop->subitem_local_name) {
-					writedata(wd, DATA, strlen(opop->subitem_local_name) + 1, opop->subitem_local_name);
-				}
-			}
-		}
-	}
+  /* ID_WM's id->properties are considered runtime only, and never written in .blend file. */
+  if (id->properties && !ELEM(GS(id->name), ID_WM)) {
+    IDP_WriteProperty(id->properties, wd);
+  }
+
+  if (id->override_static) {
+    writestruct(wd, DATA, IDOverrideStatic, 1, id->override_static);
+
+    writelist(wd, DATA, IDOverrideStaticProperty, &id->override_static->properties);
+    for (IDOverrideStaticProperty *op = id->override_static->properties.first; op; op = op->next) {
+      writedata(wd, DATA, strlen(op->rna_path) + 1, op->rna_path);
+
+      writelist(wd, DATA, IDOverrideStaticPropertyOperation, &op->operations);
+      for (IDOverrideStaticPropertyOperation *opop = op->operations.first; opop;
+           opop = opop->next) {
+        if (opop->subitem_reference_name) {
+          writedata(
+              wd, DATA, strlen(opop->subitem_reference_name) + 1, opop->subitem_reference_name);
+        }
+        if (opop->subitem_local_name) {
+          writedata(wd, DATA, strlen(opop->subitem_local_name) + 1, opop->subitem_local_name);
+        }
+      }
+    }
+  }
 }
 
 static void write_previews(WriteData *wd, const PreviewImage *prv_orig)
 {
-	/* Note we write previews also for undo steps. It takes up some memory,
-	 * but not doing so would causes all previews to be re-rendered after
-	 * undo which is too expensive. */
-	if (prv_orig) {
-		PreviewImage prv = *prv_orig;
-
-		/* don't write out large previews if not requested */
-		if (!(U.flag & USER_SAVE_PREVIEWS)) {
-			prv.w[1] = 0;
-			prv.h[1] = 0;
-			prv.rect[1] = NULL;
-		}
-		writestruct_at_address(wd, DATA, PreviewImage, 1, prv_orig, &prv);
-		if (prv.rect[0]) {
-			writedata(wd, DATA, prv.w[0] * prv.h[0] * sizeof(uint), prv.rect[0]);
-		}
-		if (prv.rect[1]) {
-			writedata(wd, DATA, prv.w[1] * prv.h[1] * sizeof(uint), prv.rect[1]);
-		}
-	}
+  /* Note we write previews also for undo steps. It takes up some memory,
+   * but not doing so would causes all previews to be re-rendered after
+   * undo which is too expensive. */
+  if (prv_orig) {
+    PreviewImage prv = *prv_orig;
+
+    /* don't write out large previews if not requested */
+    if (!(U.flag & USER_SAVE_PREVIEWS)) {
+      prv.w[1] = 0;
+      prv.h[1] = 0;
+      prv.rect[1] = NULL;
+    }
+    writestruct_at_address(wd, DATA, PreviewImage, 1, prv_orig, &prv);
+    if (prv.rect[0]) {
+      writedata(wd, DATA, prv.w[0] * prv.h[0] * sizeof(uint), prv.rect[0]);
+    }
+    if (prv.rect[1]) {
+      writedata(wd, DATA, prv.w[1] * prv.h[1] * sizeof(uint), prv.rect[1]);
+    }
+  }
 }
 
 static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
 {
-	FModifier *fcm;
-
-	/* Write all modifiers first (for faster reloading) */
-	writelist(wd, DATA, FModifier, fmodifiers);
-
-	/* Modifiers */
-	for (fcm = fmodifiers->first; fcm; fcm = fcm->next) {
-		const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
-
-		/* Write the specific data */
-		if (fmi && fcm->data) {
-			/* firstly, just write the plain fmi->data struct */
-			writestruct_id(wd, DATA, fmi->structName, 1, fcm->data);
-
-			/* do any modifier specific stuff */
-			switch (fcm->type) {
-				case FMODIFIER_TYPE_GENERATOR:
-				{
-					FMod_Generator *data = fcm->data;
-
-					/* write coefficients array */
-					if (data->coefficients) {
-						writedata(wd, DATA, sizeof(float) * (data->arraysize), data->coefficients);
-					}
-
-					break;
-				}
-				case FMODIFIER_TYPE_ENVELOPE:
-				{
-					FMod_Envelope *data = fcm->data;
-
-					/* write envelope data */
-					if (data->data) {
-						writestruct(wd, DATA, FCM_EnvelopeData, data->totvert, data->data);
-					}
-
-					break;
-				}
-				case FMODIFIER_TYPE_PYTHON:
-				{
-					FMod_Python *data = fcm->data;
-
-					/* Write ID Properties -- and copy this comment EXACTLY for easy finding
-					 * of library blocks that implement this.*/
-					IDP_WriteProperty(data->prop, wd);
-
-					break;
-				}
-			}
-		}
-	}
+  FModifier *fcm;
+
+  /* Write all modifiers first (for faster reloading) */
+  writelist(wd, DATA, FModifier, fmodifiers);
+
+  /* Modifiers */
+  for (fcm = fmodifiers->first; fcm; fcm = fcm->next) {
+    const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
+
+    /* Write the specific data */
+    if (fmi && fcm->data) {
+      /* firstly, just write the plain fmi->data struct */
+      writestruct_id(wd, DATA, fmi->structName, 1, fcm->data);
+
+      /* do any modifier specific stuff */
+      switch (fcm->type) {
+        case FMODIFIER_TYPE_GENERATOR: {
+          FMod_Generator *data = fcm->data;
+
+          /* write coefficients array */
+          if (data->coefficients) {
+            writedata(wd, DATA, sizeof(float) * (data->arraysize), data->coefficients);
+          }
+
+          break;
+        }
+        case FMODIFIER_TYPE_ENVELOPE: {
+          FMod_Envelope *data = fcm->data;
+
+          /* write envelope data */
+          if (data->data) {
+            writestruct(wd, DATA, FCM_EnvelopeData, data->totvert, data->data);
+          }
+
+          break;
+        }
+        case FMODIFIER_TYPE_PYTHON: {
+          FMod_Python *data = fcm->data;
+
+          /* Write ID Properties -- and copy this comment EXACTLY for easy finding
+           * of library blocks that implement this.*/
+          IDP_WriteProperty(data->prop, wd);
+
+          break;
+        }
+      }
+    }
+  }
 }
 
 static void write_fcurves(WriteData *wd, ListBase *fcurves)
 {
-	FCurve *fcu;
-
-	writelist(wd, DATA, FCurve, fcurves);
-	for (fcu = fcurves->first; fcu; fcu = fcu->next) {
-		/* curve data */
-		if (fcu->bezt) {
-			writestruct(wd, DATA, BezTriple, fcu->totvert, fcu->bezt);
-		}
-		if (fcu->fpt) {
-			writestruct(wd, DATA, FPoint, fcu->totvert, fcu->fpt);
-		}
-
-		if (fcu->rna_path) {
-			writedata(wd, DATA, strlen(fcu->rna_path) + 1, fcu->rna_path);
-		}
-
-		/* driver data */
-		if (fcu->driver) {
-			ChannelDriver *driver = fcu->driver;
-			DriverVar *dvar;
-
-			writestruct(wd, DATA, ChannelDriver, 1, driver);
-
-			/* variables */
-			writelist(wd, DATA, DriverVar, &driver->variables);
-			for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
-				DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar)
-				{
-					if (dtar->rna_path) {
-						writedata(wd, DATA, strlen(dtar->rna_path) + 1, dtar->rna_path);
-					}
-				}
-				DRIVER_TARGETS_LOOPER_END;
-			}
-		}
-
-		/* write F-Modifiers */
-		write_fmodifiers(wd, &fcu->modifiers);
-	}
+  FCurve *fcu;
+
+  writelist(wd, DATA, FCurve, fcurves);
+  for (fcu = fcurves->first; fcu; fcu = fcu->next) {
+    /* curve data */
+    if (fcu->bezt) {
+      writestruct(wd, DATA, BezTriple, fcu->totvert, fcu->bezt);
+    }
+    if (fcu->fpt) {
+      writestruct(wd, DATA, FPoint, fcu->totvert, fcu->fpt);
+    }
+
+    if (fcu->rna_path) {
+      writedata(wd, DATA, strlen(fcu->rna_path) + 1, fcu->rna_path);
+    }
+
+    /* driver data */
+    if (fcu->driver) {
+      ChannelDriver *driver = fcu->driver;
+      DriverVar *dvar;
+
+      writestruct(wd, DATA, ChannelDriver, 1, driver);
+
+      /* variables */
+      writelist(wd, DATA, DriverVar, &driver->variables);
+      for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
+        DRIVER_TARGETS_USED_LOOPER_BEGIN (dvar) {
+          if (dtar->rna_path) {
+            writedata(wd, DATA, strlen(dtar->rna_path) + 1, dtar->rna_path);
+          }
+        }
+        DRIVER_TARGETS_LOOPER_END;
+      }
+    }
+
+    /* write F-Modifiers */
+    write_fmodifiers(wd, &fcu->modifiers);
+  }
 }
 
 static void write_action(WriteData *wd, bAction *act)
 {
-	if (act->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_AC, bAction, 1, act);
-		write_iddata(wd, &act->id);
+  if (act->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_AC, bAction, 1, act);
+    write_iddata(wd, &act->id);
 
-		write_fcurves(wd, &act->curves);
+    write_fcurves(wd, &act->curves);
 
-		for (bActionGroup *grp = act->groups.first; grp; grp = grp->next) {
-			writestruct(wd, DATA, bActionGroup, 1, grp);
-		}
+    for (bActionGroup *grp = act->groups.first; grp; grp = grp->next) {
+      writestruct(wd, DATA, bActionGroup, 1, grp);
+    }
 
-		for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
-			writestruct(wd, DATA, TimeMarker, 1, marker);
-		}
-	}
+    for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
+      writestruct(wd, DATA, TimeMarker, 1, marker);
+    }
+  }
 }
 
 static void write_keyingsets(WriteData *wd, ListBase *list)
 {
-	KeyingSet *ks;
-	KS_Path *ksp;
-
-	for (ks = list->first; ks; ks = ks->next) {
-		/* KeyingSet */
-		writestruct(wd, DATA, KeyingSet, 1, ks);
-
-		/* Paths */
-		for (ksp = ks->paths.first; ksp; ksp = ksp->next) {
-			/* Path */
-			writestruct(wd, DATA, KS_Path, 1, ksp);
-
-			if (ksp->rna_path) {
-				writedata(wd, DATA, strlen(ksp->rna_path) + 1, ksp->rna_path);
-			}
-		}
-	}
+  KeyingSet *ks;
+  KS_Path *ksp;
+
+  for (ks = list->first; ks; ks = ks->next) {
+    /* KeyingSet */
+    writestruct(wd, DATA, KeyingSet, 1, ks);
+
+    /* Paths */
+    for (ksp = ks->paths.first; ksp; ksp = ksp->next) {
+      /* Path */
+      writestruct(wd, DATA, KS_Path, 1, ksp);
+
+      if (ksp->rna_path) {
+        writedata(wd, DATA, strlen(ksp->rna_path) + 1, ksp->rna_path);
+      }
+    }
+  }
 }
 
 static void write_nlastrips(WriteData *wd, ListBase *strips)
 {
-	NlaStrip *strip;
+  NlaStrip *strip;
 
-	writelist(wd, DATA, NlaStrip, strips);
-	for (strip = strips->first; strip; strip = strip->next) {
-		/* write the strip's F-Curves and modifiers */
-		write_fcurves(wd, &strip->fcurves);
-		write_fmodifiers(wd, &strip->modifiers);
+  writelist(wd, DATA, NlaStrip, strips);
+  for (strip = strips->first; strip; strip = strip->next) {
+    /* write the strip's F-Curves and modifiers */
+    write_fcurves(wd, &strip->fcurves);
+    write_fmodifiers(wd, &strip->modifiers);
 
-		/* write the strip's children */
-		write_nlastrips(wd, &strip->strips);
-	}
+    /* write the strip's children */
+    write_nlastrips(wd, &strip->strips);
+  }
 }
 
 static void write_nladata(WriteData *wd, ListBase *nlabase)
 {
-	NlaTrack *nlt;
+  NlaTrack *nlt;
 
-	/* write all the tracks */
-	for (nlt = nlabase->first; nlt; nlt = nlt->next) {
-		/* write the track first */
-		writestruct(wd, DATA, NlaTrack, 1, nlt);
+  /* write all the tracks */
+  for (nlt = nlabase->first; nlt; nlt = nlt->next) {
+    /* write the track first */
+    writestruct(wd, DATA, NlaTrack, 1, nlt);
 
-		/* write the track's strips */
-		write_nlastrips(wd, &nlt->strips);
-	}
+    /* write the track's strips */
+    write_nlastrips(wd, &nlt->strips);
+  }
 }
 
 static void write_animdata(WriteData *wd, AnimData *adt)
 {
-	AnimOverride *aor;
+  AnimOverride *aor;
 
-	/* firstly, just write the AnimData block */
-	writestruct(wd, DATA, AnimData, 1, adt);
+  /* firstly, just write the AnimData block */
+  writestruct(wd, DATA, AnimData, 1, adt);
 
-	/* write drivers */
-	write_fcurves(wd, &adt->drivers);
+  /* write drivers */
+  write_fcurves(wd, &adt->drivers);
 
-	/* write overrides */
-	// FIXME: are these needed?
-	for (aor = adt->overrides.first; aor; aor = aor->next) {
-		/* overrides consist of base data + rna_path */
-		writestruct(wd, DATA, AnimOverride, 1, aor);
-		writedata(wd, DATA, strlen(aor->rna_path) + 1, aor->rna_path);
-	}
+  /* write overrides */
+  // FIXME: are these needed?
+  for (aor = adt->overrides.first; aor; aor = aor->next) {
+    /* overrides consist of base data + rna_path */
+    writestruct(wd, DATA, AnimOverride, 1, aor);
+    writedata(wd, DATA, strlen(aor->rna_path) + 1, aor->rna_path);
+  }
 
-	// TODO write the remaps (if they are needed)
+  // TODO write the remaps (if they are needed)
 
-	/* write NLA data */
-	write_nladata(wd, &adt->nla_tracks);
+  /* write NLA data */
+  write_nladata(wd, &adt->nla_tracks);
 }
 
 static void write_curvemapping_curves(WriteData *wd, CurveMapping *cumap)
 {
-	for (int a = 0; a < CM_TOT; a++) {
-		writestruct(wd, DATA, CurveMapPoint, cumap->cm[a].totpoint, cumap->cm[a].curve);
-	}
+  for (int a = 0; a < CM_TOT; a++) {
+    writestruct(wd, DATA, CurveMapPoint, cumap->cm[a].totpoint, cumap->cm[a].curve);
+  }
 }
 
 static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
 {
-	writestruct(wd, DATA, CurveMapping, 1, cumap);
+  writestruct(wd, DATA, CurveMapping, 1, cumap);
 
-	write_curvemapping_curves(wd, cumap);
+  write_curvemapping_curves(wd, cumap);
 }
 
-static void write_node_socket(WriteData *wd, bNodeTree *UNUSED(ntree), bNode *node, bNodeSocket *sock)
+static void write_node_socket(WriteData *wd,
+                              bNodeTree *UNUSED(ntree),
+                              bNode *node,
+                              bNodeSocket *sock)
 {
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-	/* forward compatibility code, so older blenders still open (not for undo) */
-	if (wd->use_memfile == false) {
-		sock->stack_type = 1;
-
-		if (node->type == NODE_GROUP) {
-			bNodeTree *ngroup = (bNodeTree *)node->id;
-			if (ngroup) {
-				/* for node groups: look up the deprecated groupsock pointer */
-				sock->groupsock = ntreeFindSocketInterface(ngroup, sock->in_out, sock->identifier);
-				BLI_assert(sock->groupsock != NULL);
-
-				/* node group sockets now use the generic identifier string to verify group nodes,
-				 * old blender uses the own_index.
-				 */
-				sock->own_index = sock->groupsock->own_index;
-			}
-		}
-	}
+  /* forward compatibility code, so older blenders still open (not for undo) */
+  if (wd->use_memfile == false) {
+    sock->stack_type = 1;
+
+    if (node->type == NODE_GROUP) {
+      bNodeTree *ngroup = (bNodeTree *)node->id;
+      if (ngroup) {
+        /* for node groups: look up the deprecated groupsock pointer */
+        sock->groupsock = ntreeFindSocketInterface(ngroup, sock->in_out, sock->identifier);
+        BLI_assert(sock->groupsock != NULL);
+
+        /* node group sockets now use the generic identifier string to verify group nodes,
+         * old blender uses the own_index.
+         */
+        sock->own_index = sock->groupsock->own_index;
+      }
+    }
+  }
 #endif
 
-	/* actual socket writing */
-	writestruct(wd, DATA, bNodeSocket, 1, sock);
+  /* actual socket writing */
+  writestruct(wd, DATA, bNodeSocket, 1, sock);
 
-	if (sock->prop) {
-		IDP_WriteProperty(sock->prop, wd);
-	}
+  if (sock->prop) {
+    IDP_WriteProperty(sock->prop, wd);
+  }
 
-	if (sock->default_value) {
-		writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
-	}
+  if (sock->default_value) {
+    writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
+  }
 }
 static void write_node_socket_interface(WriteData *wd, bNodeTree *UNUSED(ntree), bNodeSocket *sock)
 {
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-	/* forward compatibility code, so older blenders still open */
-	sock->stack_type = 1;
+  /* forward compatibility code, so older blenders still open */
+  sock->stack_type = 1;
 
-	/* Reconstruct the deprecated default_value structs in socket interface DNA. */
-	if (sock->default_value == NULL && sock->typeinfo) {
-		node_socket_init_default_value(sock);
-	}
+  /* Reconstruct the deprecated default_value structs in socket interface DNA. */
+  if (sock->default_value == NULL && sock->typeinfo) {
+    node_socket_init_default_value(sock);
+  }
 #endif
 
-	/* actual socket writing */
-	writestruct(wd, DATA, bNodeSocket, 1, sock);
+  /* actual socket writing */
+  writestruct(wd, DATA, bNodeSocket, 1, sock);
 
-	if (sock->prop) {
-		IDP_WriteProperty(sock->prop, wd);
-	}
+  if (sock->prop) {
+    IDP_WriteProperty(sock->prop, wd);
+  }
 
-	if (sock->default_value) {
-		writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
-	}
+  if (sock->default_value) {
+    writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
+  }
 }
 /* this is only direct data, tree itself should have been written */
 static void write_nodetree_nolib(WriteData *wd, bNodeTree *ntree)
 {
-	bNode *node;
-	bNodeSocket *sock;
-	bNodeLink *link;
-
-	/* for link_list() speed, we write per list */
-
-	if (ntree->adt) {
-		write_animdata(wd, ntree->adt);
-	}
-
-	for (node = ntree->nodes.first; node; node = node->next) {
-		writestruct(wd, DATA, bNode, 1, node);
-
-		if (node->prop) {
-			IDP_WriteProperty(node->prop, wd);
-		}
-
-		for (sock = node->inputs.first; sock; sock = sock->next) {
-			write_node_socket(wd, ntree, node, sock);
-		}
-		for (sock = node->outputs.first; sock; sock = sock->next) {
-			write_node_socket(wd, ntree, node, sock);
-		}
-
-		for (link = node->internal_links.first; link; link = link->next) {
-			writestruct(wd, DATA, bNodeLink, 1, link);
-		}
-
-		if (node->storage) {
-			/* could be handlerized at some point, now only 1 exception still */
-			if ((ntree->type == NTREE_SHADER) &&
-			    ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB))
-			{
-				write_curvemapping(wd, node->storage);
-			}
-			else if (ntree->type == NTREE_SHADER &&
-			         (node->type == SH_NODE_SCRIPT))
-			{
-				NodeShaderScript *nss = (NodeShaderScript *)node->storage;
-				if (nss->bytecode) {
-					writedata(wd, DATA, strlen(nss->bytecode) + 1, nss->bytecode);
-				}
-				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
-			}
-			else if ((ntree->type == NTREE_COMPOSIT) &&
-			         ELEM(node->type, CMP_NODE_TIME, CMP_NODE_CURVE_VEC, CMP_NODE_CURVE_RGB, CMP_NODE_HUECORRECT))
-			{
-				write_curvemapping(wd, node->storage);
-			}
-			else if ((ntree->type == NTREE_TEXTURE) &&
-			         (node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME))
-			{
-				write_curvemapping(wd, node->storage);
-			}
-			else if ((ntree->type == NTREE_COMPOSIT) &&
-			         (node->type == CMP_NODE_MOVIEDISTORTION))
-			{
-				/* pass */
-			}
-			else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_GLARE)) {
-				/* Simple forward compat for fix for T50736.
-				 * Not ideal (there is no ideal solution here), but should do for now. */
-				NodeGlare *ndg = node->storage;
-				/* Not in undo case. */
-				if (wd->use_memfile == false) {
-					switch (ndg->type) {
-						case 2:  /* Grrrr! magic numbers :( */
-							ndg->angle = ndg->streaks;
-							break;
-						case 0:
-							ndg->angle = ndg->star_45;
-							break;
-						default:
-							break;
-					}
-				}
-				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
-			}
-			else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_CRYPTOMATTE)) {
-				NodeCryptomatte *nc = (NodeCryptomatte *)node->storage;
-				if (nc->matte_id) {
-					writedata(wd, DATA, strlen(nc->matte_id) + 1, nc->matte_id);
-				}
-				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
-			}
-			else {
-				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
-			}
-		}
-
-		if (node->type == CMP_NODE_OUTPUT_FILE) {
-			/* inputs have own storage data */
-			for (sock = node->inputs.first; sock; sock = sock->next) {
-				writestruct(wd, DATA, NodeImageMultiFileSocket, 1, sock->storage);
-			}
-		}
-		if (ELEM(node->type, CMP_NODE_IMAGE, CMP_NODE_R_LAYERS)) {
-			/* write extra socket info */
-			for (sock = node->outputs.first; sock; sock = sock->next) {
-				writestruct(wd, DATA, NodeImageLayer, 1, sock->storage);
-			}
-		}
-	}
-
-	for (link = ntree->links.first; link; link = link->next) {
-		writestruct(wd, DATA, bNodeLink, 1, link);
-	}
-
-	for (sock = ntree->inputs.first; sock; sock = sock->next) {
-		write_node_socket_interface(wd, ntree, sock);
-	}
-	for (sock = ntree->outputs.first; sock; sock = sock->next) {
-		write_node_socket_interface(wd, ntree, sock);
-	}
+  bNode *node;
+  bNodeSocket *sock;
+  bNodeLink *link;
+
+  /* for link_list() speed, we write per list */
+
+  if (ntree->adt) {
+    write_animdata(wd, ntree->adt);
+  }
+
+  for (node = ntree->nodes.first; node; node = node->next) {
+    writestruct(wd, DATA, bNode, 1, node);
+
+    if (node->prop) {
+      IDP_WriteProperty(node->prop, wd);
+    }
+
+    for (sock = node->inputs.first; sock; sock = sock->next) {
+      write_node_socket(wd, ntree, node, sock);
+    }
+    for (sock = node->outputs.first; sock; sock = sock->next) {
+      write_node_socket(wd, ntree, node, sock);
+    }
+
+    for (link = node->internal_links.first; link; link = link->next) {
+      writestruct(wd, DATA, bNodeLink, 1, link);
+    }
+
+    if (node->storage) {
+      /* could be handlerized at some point, now only 1 exception still */
+      if ((ntree->type == NTREE_SHADER) &&
+          ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB)) {
+        write_curvemapping(wd, node->storage);
+      }
+      else if (ntree->type == NTREE_SHADER && (node->type == SH_NODE_SCRIPT)) {
+        NodeShaderScript *nss = (NodeShaderScript *)node->storage;
+        if (nss->bytecode) {
+          writedata(wd, DATA, strlen(nss->bytecode) + 1, nss->bytecode);
+        }
+        writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+      }
+      else if ((ntree->type == NTREE_COMPOSIT) && ELEM(node->type,
+                                                       CMP_NODE_TIME,
+                                                       CMP_NODE_CURVE_VEC,
+                                                       CMP_NODE_CURVE_RGB,
+                                                       CMP_NODE_HUECORRECT)) {
+        write_curvemapping(wd, node->storage);
+      }
+      else if ((ntree->type == NTREE_TEXTURE) &&
+               (node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME)) {
+        write_curvemapping(wd, node->storage);
+      }
+      else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_MOVIEDISTORTION)) {
+        /* pass */
+      }
+      else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_GLARE)) {
+        /* Simple forward compat for fix for T50736.
+         * Not ideal (there is no ideal solution here), but should do for now. */
+        NodeGlare *ndg = node->storage;
+        /* Not in undo case. */
+        if (wd->use_memfile == false) {
+          switch (ndg->type) {
+            case 2: /* Grrrr! magic numbers :( */
+              ndg->angle = ndg->streaks;
+              break;
+            case 0:
+              ndg->angle = ndg->star_45;
+              break;
+            default:
+              break;
+          }
+        }
+        writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+      }
+      else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_CRYPTOMATTE)) {
+        NodeCryptomatte *nc = (NodeCryptomatte *)node->storage;
+        if (nc->matte_id) {
+          writedata(wd, DATA, strlen(nc->matte_id) + 1, nc->matte_id);
+        }
+        writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+      }
+      else {
+        writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+      }
+    }
+
+    if (node->type == CMP_NODE_OUTPUT_FILE) {
+      /* inputs have own storage data */
+      for (sock = node->inputs.first; sock; sock = sock->next) {
+        writestruct(wd, DATA, NodeImageMultiFileSocket, 1, sock->storage);
+      }
+    }
+    if (ELEM(node->type, CMP_NODE_IMAGE, CMP_NODE_R_LAYERS)) {
+      /* write extra socket info */
+      for (sock = node->outputs.first; sock; sock = sock->next) {
+        writestruct(wd, DATA, NodeImageLayer, 1, sock->storage);
+      }
+    }
+  }
+
+  for (link = ntree->links.first; link; link = link->next) {
+    writestruct(wd, DATA, bNodeLink, 1, link);
+  }
+
+  for (sock = ntree->inputs.first; sock; sock = sock->next) {
+    write_node_socket_interface(wd, ntree, sock);
+  }
+  for (sock = ntree->outputs.first; sock; sock = sock->next) {
+    write_node_socket_interface(wd, ntree, sock);
+  }
 }
 
 /**
  * Take care using 'use_active_win', since we wont want the currently active window
  * to change which scene renders (currently only used for undo).
  */
-static void current_screen_compat(
-        Main *mainvar, bool use_active_win,
-        bScreen **r_screen, Scene **r_scene, ViewLayer **r_view_layer)
+static void current_screen_compat(Main *mainvar,
+                                  bool use_active_win,
+                                  bScreen **r_screen,
+                                  Scene **r_scene,
+                                  ViewLayer **r_view_layer)
 {
-	wmWindowManager *wm;
-	wmWindow *window = NULL;
-
-	/* find a global current screen in the first open window, to have
-	 * a reasonable default for reading in older versions */
-	wm = mainvar->wm.first;
-
-	if (wm) {
-		if (use_active_win) {
-			/* write the active window into the file, needed for multi-window undo T43424 */
-			for (window = wm->windows.first; window; window = window->next) {
-				if (window->active) {
-					break;
-				}
-			}
-
-			/* fallback */
-			if (window == NULL) {
-				window = wm->windows.first;
-			}
-		}
-		else {
-			window = wm->windows.first;
-		}
-	}
-
-	*r_screen = (window) ? BKE_workspace_active_screen_get(window->workspace_hook) : NULL;
-	*r_scene = (window) ? window->scene : NULL;
-	*r_view_layer = (window && *r_scene) ? BKE_view_layer_find(*r_scene, window->view_layer_name) : NULL;
+  wmWindowManager *wm;
+  wmWindow *window = NULL;
+
+  /* find a global current screen in the first open window, to have
+   * a reasonable default for reading in older versions */
+  wm = mainvar->wm.first;
+
+  if (wm) {
+    if (use_active_win) {
+      /* write the active window into the file, needed for multi-window undo T43424 */
+      for (window = wm->windows.first; window; window = window->next) {
+        if (window->active) {
+          break;
+        }
+      }
+
+      /* fallback */
+      if (window == NULL) {
+        window = wm->windows.first;
+      }
+    }
+    else {
+      window = wm->windows.first;
+    }
+  }
+
+  *r_screen = (window) ? BKE_workspace_active_screen_get(window->workspace_hook) : NULL;
+  *r_scene = (window) ? window->scene : NULL;
+  *r_view_layer = (window && *r_scene) ? BKE_view_layer_find(*r_scene, window->view_layer_name) :
+                                         NULL;
 }
 
 typedef struct RenderInfo {
-	int sfra;
-	int efra;
-	char scene_name[MAX_ID_NAME - 2];
+  int sfra;
+  int efra;
+  char scene_name[MAX_ID_NAME - 2];
 } RenderInfo;
 
 /* was for historic render-deamon feature,
@@ -1194,2579 +1186,2598 @@ typedef struct RenderInfo {
  * reading the whole blend file */
 static void write_renderinfo(WriteData *wd, Main *mainvar)
 {
-	bScreen *curscreen;
-	Scene *sce, *curscene = NULL;
-	ViewLayer *view_layer;
-	RenderInfo data;
+  bScreen *curscreen;
+  Scene *sce, *curscene = NULL;
+  ViewLayer *view_layer;
+  RenderInfo data;
 
-	/* XXX in future, handle multiple windows with multiple screens? */
-	current_screen_compat(mainvar, false, &curscreen, &curscene, &view_layer);
+  /* XXX in future, handle multiple windows with multiple screens? */
+  current_screen_compat(mainvar, false, &curscreen, &curscene, &view_layer);
 
-	for (sce = mainvar->scenes.first; sce; sce = sce->id.next) {
-		if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode & R_BG_RENDER))) {
-			data.sfra = sce->r.sfra;
-			data.efra = sce->r.efra;
-			memset(data.scene_name, 0, sizeof(data.scene_name));
+  for (sce = mainvar->scenes.first; sce; sce = sce->id.next) {
+    if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode & R_BG_RENDER))) {
+      data.sfra = sce->r.sfra;
+      data.efra = sce->r.efra;
+      memset(data.scene_name, 0, sizeof(data.scene_name));
 
-			BLI_strncpy(data.scene_name, sce->id.name + 2, sizeof(data.scene_name));
+      BLI_strncpy(data.scene_name, sce->id.name + 2, sizeof(data.scene_name));
 
-			writedata(wd, REND, sizeof(data), &data);
-		}
-	}
+      writedata(wd, REND, sizeof(data), &data);
+    }
+  }
 }
 
 static void write_keymapitem(WriteData *wd, const wmKeyMapItem *kmi)
 {
-	writestruct(wd, DATA, wmKeyMapItem, 1, kmi);
-	if (kmi->properties) {
-		IDP_WriteProperty(kmi->properties, wd);
-	}
+  writestruct(wd, DATA, wmKeyMapItem, 1, kmi);
+  if (kmi->properties) {
+    IDP_WriteProperty(kmi->properties, wd);
+  }
 }
 
 static void write_userdef(WriteData *wd, const UserDef *userdef)
 {
-	writestruct(wd, USER, UserDef, 1, userdef);
-
-	for (const bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
-		writestruct(wd, DATA, bTheme, 1, btheme);
-	}
-
-	for (const wmKeyMap *keymap = userdef->user_keymaps.first; keymap; keymap = keymap->next) {
-		writestruct(wd, DATA, wmKeyMap, 1, keymap);
-
-		for (const wmKeyMapDiffItem *kmdi = keymap->diff_items.first; kmdi; kmdi = kmdi->next) {
-			writestruct(wd, DATA, wmKeyMapDiffItem, 1, kmdi);
-			if (kmdi->remove_item) {
-				write_keymapitem(wd, kmdi->remove_item);
-			}
-			if (kmdi->add_item) {
-				write_keymapitem(wd, kmdi->add_item);
-			}
-		}
-
-		for (const wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
-			write_keymapitem(wd, kmi);
-		}
-	}
-
-	for (const wmKeyConfigPref *kpt = userdef->user_keyconfig_prefs.first; kpt; kpt = kpt->next) {
-		writestruct(wd, DATA, wmKeyConfigPref, 1, kpt);
-		if (kpt->prop) {
-			IDP_WriteProperty(kpt->prop, wd);
-		}
-	}
-
-	for (const bUserMenu *um = userdef->user_menus.first; um; um = um->next) {
-		writestruct(wd, DATA, bUserMenu, 1, um);
-		for (const bUserMenuItem *umi = um->items.first; umi; umi = umi->next) {
-			if (umi->type == USER_MENU_TYPE_OPERATOR) {
-				const bUserMenuItem_Op *umi_op = (const bUserMenuItem_Op *)umi;
-				writestruct(wd, DATA, bUserMenuItem_Op, 1, umi_op);
-				if (umi_op->prop) {
-					IDP_WriteProperty(umi_op->prop, wd);
-				}
-			}
-			else if (umi->type == USER_MENU_TYPE_MENU) {
-				const bUserMenuItem_Menu *umi_mt = (const bUserMenuItem_Menu *)umi;
-				writestruct(wd, DATA, bUserMenuItem_Menu, 1, umi_mt);
-			}
-			else if (umi->type == USER_MENU_TYPE_PROP) {
-				const bUserMenuItem_Prop *umi_pr = (const bUserMenuItem_Prop *)umi;
-				writestruct(wd, DATA, bUserMenuItem_Prop, 1, umi_pr);
-			}
-			else {
-				writestruct(wd, DATA, bUserMenuItem, 1, umi);
-			}
-		}
-	}
-
-	for (const bAddon *bext = userdef->addons.first; bext; bext = bext->next) {
-		writestruct(wd, DATA, bAddon, 1, bext);
-		if (bext->prop) {
-			IDP_WriteProperty(bext->prop, wd);
-		}
-	}
-
-	for (const bPathCompare *path_cmp = userdef->autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) {
-		writestruct(wd, DATA, bPathCompare, 1, path_cmp);
-	}
-
-	for (const uiStyle *style = userdef->uistyles.first; style; style = style->next) {
-		writestruct(wd, DATA, uiStyle, 1, style);
-	}
+  writestruct(wd, USER, UserDef, 1, userdef);
+
+  for (const bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
+    writestruct(wd, DATA, bTheme, 1, btheme);
+  }
+
+  for (const wmKeyMap *keymap = userdef->user_keymaps.first; keymap; keymap = keymap->next) {
+    writestruct(wd, DATA, wmKeyMap, 1, keymap);
+
+    for (const wmKeyMapDiffItem *kmdi = keymap->diff_items.first; kmdi; kmdi = kmdi->next) {
+      writestruct(wd, DATA, wmKeyMapDiffItem, 1, kmdi);
+      if (kmdi->remove_item) {
+        write_keymapitem(wd, kmdi->remove_item);
+      }
+      if (kmdi->add_item) {
+        write_keymapitem(wd, kmdi->add_item);
+      }
+    }
+
+    for (const wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
+      write_keymapitem(wd, kmi);
+    }
+  }
+
+  for (const wmKeyConfigPref *kpt = userdef->user_keyconfig_prefs.first; kpt; kpt = kpt->next) {
+    writestruct(wd, DATA, wmKeyConfigPref, 1, kpt);
+    if (kpt->prop) {
+      IDP_WriteProperty(kpt->prop, wd);
+    }
+  }
+
+  for (const bUserMenu *um = userdef->user_menus.first; um; um = um->next) {
+    writestruct(wd, DATA, bUserMenu, 1, um);
+    for (const bUserMenuItem *umi = um->items.first; umi; umi = umi->next) {
+      if (umi->type == USER_MENU_TYPE_OPERATOR) {
+        const bUserMenuItem_Op *umi_op = (const bUserMenuItem_Op *)umi;
+        writestruct(wd, DATA, bUserMenuItem_Op, 1, umi_op);
+        if (umi_op->prop) {
+          IDP_WriteProperty(umi_op->prop, wd);
+        }
+      }
+      else if (umi->type == USER_MENU_TYPE_MENU) {
+        const bUserMenuItem_Menu *umi_mt = (const bUserMenuItem_Menu *)umi;
+        writestruct(wd, DATA, bUserMenuItem_Menu, 1, umi_mt);
+      }
+      else if (umi->type == USER_MENU_TYPE_PROP) {
+        const bUserMenuItem_Prop *umi_pr = (const bUserMenuItem_Prop *)umi;
+        writestruct(wd, DATA, bUserMenuItem_Prop, 1, umi_pr);
+      }
+      else {
+        writestruct(wd, DATA, bUserMenuItem, 1, umi);
+      }
+    }
+  }
+
+  for (const bAddon *bext = userdef->addons.first; bext; bext = bext->next) {
+    writestruct(wd, DATA, bAddon, 1, bext);
+    if (bext->prop) {
+      IDP_WriteProperty(bext->prop, wd);
+    }
+  }
+
+  for (const bPathCompare *path_cmp = userdef->autoexec_paths.first; path_cmp;
+       path_cmp = path_cmp->next) {
+    writestruct(wd, DATA, bPathCompare, 1, path_cmp);
+  }
+
+  for (const uiStyle *style = userdef->uistyles.first; style; style = style->next) {
+    writestruct(wd, DATA, uiStyle, 1, style);
+  }
 }
 
 static void write_boid_state(WriteData *wd, BoidState *state)
 {
-	BoidRule *rule = state->rules.first;
-
-	writestruct(wd, DATA, BoidState, 1, state);
-
-	for (; rule; rule = rule->next) {
-		switch (rule->type) {
-			case eBoidRuleType_Goal:
-			case eBoidRuleType_Avoid:
-				writestruct(wd, DATA, BoidRuleGoalAvoid, 1, rule);
-				break;
-			case eBoidRuleType_AvoidCollision:
-				writestruct(wd, DATA, BoidRuleAvoidCollision, 1, rule);
-				break;
-			case eBoidRuleType_FollowLeader:
-				writestruct(wd, DATA, BoidRuleFollowLeader, 1, rule);
-				break;
-			case eBoidRuleType_AverageSpeed:
-				writestruct(wd, DATA, BoidRuleAverageSpeed, 1, rule);
-				break;
-			case eBoidRuleType_Fight:
-				writestruct(wd, DATA, BoidRuleFight, 1, rule);
-				break;
-			default:
-				writestruct(wd, DATA, BoidRule, 1, rule);
-				break;
-		}
-	}
+  BoidRule *rule = state->rules.first;
+
+  writestruct(wd, DATA, BoidState, 1, state);
+
+  for (; rule; rule = rule->next) {
+    switch (rule->type) {
+      case eBoidRuleType_Goal:
+      case eBoidRuleType_Avoid:
+        writestruct(wd, DATA, BoidRuleGoalAvoid, 1, rule);
+        break;
+      case eBoidRuleType_AvoidCollision:
+        writestruct(wd, DATA, BoidRuleAvoidCollision, 1, rule);
+        break;
+      case eBoidRuleType_FollowLeader:
+        writestruct(wd, DATA, BoidRuleFollowLeader, 1, rule);
+        break;
+      case eBoidRuleType_AverageSpeed:
+        writestruct(wd, DATA, BoidRuleAverageSpeed, 1, rule);
+        break;
+      case eBoidRuleType_Fight:
+        writestruct(wd, DATA, BoidRuleFight, 1, rule);
+        break;
+      default:
+        writestruct(wd, DATA, BoidRule, 1, rule);
+        break;
+    }
+  }
 #if 0
-	BoidCondition *cond = state->conditions.first;
-	for (; cond; cond = cond->next) {
-		writestruct(wd, DATA, BoidCondition, 1, cond);
-	}
+  BoidCondition *cond = state->conditions.first;
+  for (; cond; cond = cond->next) {
+    writestruct(wd, DATA, BoidCondition, 1, cond);
+  }
 #endif
 }
 
 /* update this also to readfile.c */
 static const char *ptcache_data_struct[] = {
-	"", // BPHYS_DATA_INDEX
-	"", // BPHYS_DATA_LOCATION
-	"", // BPHYS_DATA_VELOCITY
-	"", // BPHYS_DATA_ROTATION
-	"", // BPHYS_DATA_AVELOCITY / BPHYS_DATA_XCONST */
-	"", // BPHYS_DATA_SIZE:
-	"", // BPHYS_DATA_TIMES:
-	"BoidData", // case BPHYS_DATA_BOIDS:
+    "",          // BPHYS_DATA_INDEX
+    "",          // BPHYS_DATA_LOCATION
+    "",          // BPHYS_DATA_VELOCITY
+    "",          // BPHYS_DATA_ROTATION
+    "",          // BPHYS_DATA_AVELOCITY / BPHYS_DATA_XCONST */
+    "",          // BPHYS_DATA_SIZE:
+    "",          // BPHYS_DATA_TIMES:
+    "BoidData",  // case BPHYS_DATA_BOIDS:
 };
 static const char *ptcache_extra_struct[] = {
-	"",
-	"ParticleSpring",
+    "",
+    "ParticleSpring",
 };
 static void write_pointcaches(WriteData *wd, ListBase *ptcaches)
 {
-	PointCache *cache = ptcaches->first;
-	int i;
-
-	for (; cache; cache = cache->next) {
-		writestruct(wd, DATA, PointCache, 1, cache);
-
-		if ((cache->flag & PTCACHE_DISK_CACHE) == 0) {
-			PTCacheMem *pm = cache->mem_cache.first;
-
-			for (; pm; pm = pm->next) {
-				PTCacheExtra *extra = pm->extradata.first;
-
-				writestruct(wd, DATA, PTCacheMem, 1, pm);
-
-				for (i = 0; i < BPHYS_TOT_DATA; i++) {
-					if (pm->data[i] && pm->data_types & (1 << i)) {
-						if (ptcache_data_struct[i][0] == '\0') {
-							writedata(wd, DATA, MEM_allocN_len(pm->data[i]), pm->data[i]);
-						}
-						else {
-							writestruct_id(wd, DATA, ptcache_data_struct[i], pm->totpoint, pm->data[i]);
-						}
-					}
-				}
-
-				for (; extra; extra = extra->next) {
-					if (ptcache_extra_struct[extra->type][0] == '\0') {
-						continue;
-					}
-					writestruct(wd, DATA, PTCacheExtra, 1, extra);
-					writestruct_id(wd, DATA, ptcache_extra_struct[extra->type], extra->totdata, extra->data);
-				}
-			}
-		}
-	}
+  PointCache *cache = ptcaches->first;
+  int i;
+
+  for (; cache; cache = cache->next) {
+    writestruct(wd, DATA, PointCache, 1, cache);
+
+    if ((cache->flag & PTCACHE_DISK_CACHE) == 0) {
+      PTCacheMem *pm = cache->mem_cache.first;
+
+      for (; pm; pm = pm->next) {
+        PTCacheExtra *extra = pm->extradata.first;
+
+        writestruct(wd, DATA, PTCacheMem, 1, pm);
+
+        for (i = 0; i < BPHYS_TOT_DATA; i++) {
+          if (pm->data[i] && pm->data_types & (1 << i)) {
+            if (ptcache_data_struct[i][0] == '\0') {
+              writedata(wd, DATA, MEM_allocN_len(pm->data[i]), pm->data[i]);
+            }
+            else {
+              writestruct_id(wd, DATA, ptcache_data_struct[i], pm->totpoint, pm->data[i]);
+            }
+          }
+        }
+
+        for (; extra; extra = extra->next) {
+          if (ptcache_extra_struct[extra->type][0] == '\0') {
+            continue;
+          }
+          writestruct(wd, DATA, PTCacheExtra, 1, extra);
+          writestruct_id(wd, DATA, ptcache_extra_struct[extra->type], extra->totdata, extra->data);
+        }
+      }
+    }
+  }
 }
 
 static void write_particlesettings(WriteData *wd, ParticleSettings *part)
 {
-	if (part->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_PA, ParticleSettings, 1, part);
-		write_iddata(wd, &part->id);
-
-		if (part->adt) {
-			write_animdata(wd, part->adt);
-		}
-		writestruct(wd, DATA, PartDeflect, 1, part->pd);
-		writestruct(wd, DATA, PartDeflect, 1, part->pd2);
-		writestruct(wd, DATA, EffectorWeights, 1, part->effector_weights);
-
-		if (part->clumpcurve) {
-			write_curvemapping(wd, part->clumpcurve);
-		}
-		if (part->roughcurve) {
-			write_curvemapping(wd, part->roughcurve);
-		}
-		if (part->twistcurve) {
-			write_curvemapping(wd, part->twistcurve);
-		}
-
-		for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) {
-			/* update indices, but only if dw->ob is set (can be NULL after loading e.g.) */
-			if (dw->ob != NULL) {
-				dw->index = 0;
-				if (part->instance_collection) { /* can be NULL if lining fails or set to None */
-					FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(part->instance_collection, object)
-					{
-						if (object == dw->ob) {
-							break;
-						}
-						dw->index++;
-					}
-					FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
-				}
-			}
-			writestruct(wd, DATA, ParticleDupliWeight, 1, dw);
-		}
-
-		if (part->boids && part->phystype == PART_PHYS_BOIDS) {
-			writestruct(wd, DATA, BoidSettings, 1, part->boids);
-
-			for (BoidState *state = part->boids->states.first; state; state = state->next) {
-				write_boid_state(wd, state);
-			}
-		}
-		if (part->fluid && part->phystype == PART_PHYS_FLUID) {
-			writestruct(wd, DATA, SPHFluidSettings, 1, part->fluid);
-		}
-
-		for (int a = 0; a < MAX_MTEX; a++) {
-			if (part->mtex[a]) {
-				writestruct(wd, DATA, MTex, 1, part->mtex[a]);
-			}
-		}
-	}
+  if (part->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_PA, ParticleSettings, 1, part);
+    write_iddata(wd, &part->id);
+
+    if (part->adt) {
+      write_animdata(wd, part->adt);
+    }
+    writestruct(wd, DATA, PartDeflect, 1, part->pd);
+    writestruct(wd, DATA, PartDeflect, 1, part->pd2);
+    writestruct(wd, DATA, EffectorWeights, 1, part->effector_weights);
+
+    if (part->clumpcurve) {
+      write_curvemapping(wd, part->clumpcurve);
+    }
+    if (part->roughcurve) {
+      write_curvemapping(wd, part->roughcurve);
+    }
+    if (part->twistcurve) {
+      write_curvemapping(wd, part->twistcurve);
+    }
+
+    for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) {
+      /* update indices, but only if dw->ob is set (can be NULL after loading e.g.) */
+      if (dw->ob != NULL) {
+        dw->index = 0;
+        if (part->instance_collection) { /* can be NULL if lining fails or set to None */
+          FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (part->instance_collection, object) {
+            if (object == dw->ob) {
+              break;
+            }
+            dw->index++;
+          }
+          FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
+        }
+      }
+      writestruct(wd, DATA, ParticleDupliWeight, 1, dw);
+    }
+
+    if (part->boids && part->phystype == PART_PHYS_BOIDS) {
+      writestruct(wd, DATA, BoidSettings, 1, part->boids);
+
+      for (BoidState *state = part->boids->states.first; state; state = state->next) {
+        write_boid_state(wd, state);
+      }
+    }
+    if (part->fluid && part->phystype == PART_PHYS_FLUID) {
+      writestruct(wd, DATA, SPHFluidSettings, 1, part->fluid);
+    }
+
+    for (int a = 0; a < MAX_MTEX; a++) {
+      if (part->mtex[a]) {
+        writestruct(wd, DATA, MTex, 1, part->mtex[a]);
+      }
+    }
+  }
 }
 
 static void write_particlesystems(WriteData *wd, ListBase *particles)
 {
-	ParticleSystem *psys = particles->first;
-	ParticleTarget *pt;
-	int a;
-
-	for (; psys; psys = psys->next) {
-		writestruct(wd, DATA, ParticleSystem, 1, psys);
-
-		if (psys->particles) {
-			writestruct(wd, DATA, ParticleData, psys->totpart, psys->particles);
-
-			if (psys->particles->hair) {
-				ParticleData *pa = psys->particles;
-
-				for (a = 0; a < psys->totpart; a++, pa++) {
-					writestruct(wd, DATA, HairKey, pa->totkey, pa->hair);
-				}
-			}
-
-			if (psys->particles->boid &&
-			    (psys->part->phystype == PART_PHYS_BOIDS))
-			{
-				writestruct(wd, DATA, BoidParticle, psys->totpart, psys->particles->boid);
-			}
-
-			if (psys->part->fluid &&
-			    (psys->part->phystype == PART_PHYS_FLUID) &&
-			    (psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS))
-			{
-				writestruct(wd, DATA, ParticleSpring, psys->tot_fluidsprings, psys->fluid_springs);
-			}
-		}
-		pt = psys->targets.first;
-		for (; pt; pt = pt->next) {
-			writestruct(wd, DATA, ParticleTarget, 1, pt);
-		}
-
-		if (psys->child) {
-			writestruct(wd, DATA, ChildParticle, psys->totchild, psys->child);
-		}
-
-		if (psys->clmd) {
-			writestruct(wd, DATA, ClothModifierData, 1, psys->clmd);
-			writestruct(wd, DATA, ClothSimSettings, 1, psys->clmd->sim_parms);
-			writestruct(wd, DATA, ClothCollSettings, 1, psys->clmd->coll_parms);
-		}
-
-		write_pointcaches(wd, &psys->ptcaches);
-	}
+  ParticleSystem *psys = particles->first;
+  ParticleTarget *pt;
+  int a;
+
+  for (; psys; psys = psys->next) {
+    writestruct(wd, DATA, ParticleSystem, 1, psys);
+
+    if (psys->particles) {
+      writestruct(wd, DATA, ParticleData, psys->totpart, psys->particles);
+
+      if (psys->particles->hair) {
+        ParticleData *pa = psys->particles;
+
+        for (a = 0; a < psys->totpart; a++, pa++) {
+          writestruct(wd, DATA, HairKey, pa->totkey, pa->hair);
+        }
+      }
+
+      if (psys->particles->boid && (psys->part->phystype == PART_PHYS_BOIDS)) {
+        writestruct(wd, DATA, BoidParticle, psys->totpart, psys->particles->boid);
+      }
+
+      if (psys->part->fluid && (psys->part->phystype == PART_PHYS_FLUID) &&
+          (psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS)) {
+        writestruct(wd, DATA, ParticleSpring, psys->tot_fluidsprings, psys->fluid_springs);
+      }
+    }
+    pt = psys->targets.first;
+    for (; pt; pt = pt->next) {
+      writestruct(wd, DATA, ParticleTarget, 1, pt);
+    }
+
+    if (psys->child) {
+      writestruct(wd, DATA, ChildParticle, psys->totchild, psys->child);
+    }
+
+    if (psys->clmd) {
+      writestruct(wd, DATA, ClothModifierData, 1, psys->clmd);
+      writestruct(wd, DATA, ClothSimSettings, 1, psys->clmd->sim_parms);
+      writestruct(wd, DATA, ClothCollSettings, 1, psys->clmd->coll_parms);
+    }
+
+    write_pointcaches(wd, &psys->ptcaches);
+  }
 }
 
 static void write_motionpath(WriteData *wd, bMotionPath *mpath)
 {
-	/* sanity checks */
-	if (mpath == NULL) {
-		return;
-	}
+  /* sanity checks */
+  if (mpath == NULL) {
+    return;
+  }
 
-	/* firstly, just write the motionpath struct */
-	writestruct(wd, DATA, bMotionPath, 1, mpath);
+  /* firstly, just write the motionpath struct */
+  writestruct(wd, DATA, bMotionPath, 1, mpath);
 
-	/* now write the array of data */
-	writestruct(wd, DATA, bMotionPathVert, mpath->length, mpath->points);
+  /* now write the array of data */
+  writestruct(wd, DATA, bMotionPathVert, mpath->length, mpath->points);
 }
 
 static void write_constraints(WriteData *wd, ListBase *conlist)
 {
-	bConstraint *con;
-
-	for (con = conlist->first; con; con = con->next) {
-		const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-
-		/* Write the specific data */
-		if (cti && con->data) {
-			/* firstly, just write the plain con->data struct */
-			writestruct_id(wd, DATA, cti->structName, 1, con->data);
-
-			/* do any constraint specific stuff */
-			switch (con->type) {
-				case CONSTRAINT_TYPE_PYTHON:
-				{
-					bPythonConstraint *data = con->data;
-					bConstraintTarget *ct;
-
-					/* write targets */
-					for (ct = data->targets.first; ct; ct = ct->next) {
-						writestruct(wd, DATA, bConstraintTarget, 1, ct);
-					}
-
-					/* Write ID Properties -- and copy this comment EXACTLY for easy finding
-					 * of library blocks that implement this.*/
-					IDP_WriteProperty(data->prop, wd);
-
-					break;
-				}
-				case CONSTRAINT_TYPE_ARMATURE:
-				{
-					bArmatureConstraint *data = con->data;
-					bConstraintTarget *ct;
-
-					/* write targets */
-					for (ct = data->targets.first; ct; ct = ct->next) {
-						writestruct(wd, DATA, bConstraintTarget, 1, ct);
-					}
-
-					break;
-				}
-				case CONSTRAINT_TYPE_SPLINEIK:
-				{
-					bSplineIKConstraint *data = con->data;
-
-					/* write points array */
-					writedata(wd, DATA, sizeof(float) * (data->numpoints), data->points);
-
-					break;
-				}
-			}
-		}
-
-		/* Write the constraint */
-		writestruct(wd, DATA, bConstraint, 1, con);
-	}
+  bConstraint *con;
+
+  for (con = conlist->first; con; con = con->next) {
+    const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
+
+    /* Write the specific data */
+    if (cti && con->data) {
+      /* firstly, just write the plain con->data struct */
+      writestruct_id(wd, DATA, cti->structName, 1, con->data);
+
+      /* do any constraint specific stuff */
+      switch (con->type) {
+        case CONSTRAINT_TYPE_PYTHON: {
+          bPythonConstraint *data = con->data;
+          bConstraintTarget *ct;
+
+          /* write targets */
+          for (ct = data->targets.first; ct; ct = ct->next) {
+            writestruct(wd, DATA, bConstraintTarget, 1, ct);
+          }
+
+          /* Write ID Properties -- and copy this comment EXACTLY for easy finding
+           * of library blocks that implement this.*/
+          IDP_WriteProperty(data->prop, wd);
+
+          break;
+        }
+        case CONSTRAINT_TYPE_ARMATURE: {
+          bArmatureConstraint *data = con->data;
+          bConstraintTarget *ct;
+
+          /* write targets */
+          for (ct = data->targets.first; ct; ct = ct->next) {
+            writestruct(wd, DATA, bConstraintTarget, 1, ct);
+          }
+
+          break;
+        }
+        case CONSTRAINT_TYPE_SPLINEIK: {
+          bSplineIKConstraint *data = con->data;
+
+          /* write points array */
+          writedata(wd, DATA, sizeof(float) * (data->numpoints), data->points);
+
+          break;
+        }
+      }
+    }
+
+    /* Write the constraint */
+    writestruct(wd, DATA, bConstraint, 1, con);
+  }
 }
 
 static void write_pose(WriteData *wd, bPose *pose)
 {
-	bPoseChannel *chan;
-	bActionGroup *grp;
-
-	/* Write each channel */
-	if (pose == NULL) {
-		return;
-	}
-
-	/* Write channels */
-	for (chan = pose->chanbase.first; chan; chan = chan->next) {
-		/* Write ID Properties -- and copy this comment EXACTLY for easy finding
-		 * of library blocks that implement this.*/
-		if (chan->prop) {
-			IDP_WriteProperty(chan->prop, wd);
-		}
-
-		write_constraints(wd, &chan->constraints);
-
-		write_motionpath(wd, chan->mpath);
-
-		/* prevent crashes with autosave,
-		 * when a bone duplicated in editmode has not yet been assigned to its posechannel */
-		if (chan->bone) {
-			/* gets restored on read, for library armatures */
-			chan->selectflag = chan->bone->flag & BONE_SELECTED;
-		}
-
-		writestruct(wd, DATA, bPoseChannel, 1, chan);
-	}
-
-	/* Write groups */
-	for (grp = pose->agroups.first; grp; grp = grp->next) {
-		writestruct(wd, DATA, bActionGroup, 1, grp);
-	}
-
-	/* write IK param */
-	if (pose->ikparam) {
-		const char *structname = BKE_pose_ikparam_get_name(pose);
-		if (structname) {
-			writestruct_id(wd, DATA, structname, 1, pose->ikparam);
-		}
-	}
-
-	/* Write this pose */
-	writestruct(wd, DATA, bPose, 1, pose);
-
+  bPoseChannel *chan;
+  bActionGroup *grp;
+
+  /* Write each channel */
+  if (pose == NULL) {
+    return;
+  }
+
+  /* Write channels */
+  for (chan = pose->chanbase.first; chan; chan = chan->next) {
+    /* Write ID Properties -- and copy this comment EXACTLY for easy finding
+     * of library blocks that implement this.*/
+    if (chan->prop) {
+      IDP_WriteProperty(chan->prop, wd);
+    }
+
+    write_constraints(wd, &chan->constraints);
+
+    write_motionpath(wd, chan->mpath);
+
+    /* prevent crashes with autosave,
+     * when a bone duplicated in editmode has not yet been assigned to its posechannel */
+    if (chan->bone) {
+      /* gets restored on read, for library armatures */
+      chan->selectflag = chan->bone->flag & BONE_SELECTED;
+    }
+
+    writestruct(wd, DATA, bPoseChannel, 1, chan);
+  }
+
+  /* Write groups */
+  for (grp = pose->agroups.first; grp; grp = grp->next) {
+    writestruct(wd, DATA, bActionGroup, 1, grp);
+  }
+
+  /* write IK param */
+  if (pose->ikparam) {
+    const char *structname = BKE_pose_ikparam_get_name(pose);
+    if (structname) {
+      writestruct_id(wd, DATA, structname, 1, pose->ikparam);
+    }
+  }
+
+  /* Write this pose */
+  writestruct(wd, DATA, bPose, 1, pose);
 }
 
 static void write_defgroups(WriteData *wd, ListBase *defbase)
 {
-	for (bDeformGroup *defgroup = defbase->first; defgroup; defgroup = defgroup->next) {
-		writestruct(wd, DATA, bDeformGroup, 1, defgroup);
-	}
+  for (bDeformGroup *defgroup = defbase->first; defgroup; defgroup = defgroup->next) {
+    writestruct(wd, DATA, bDeformGroup, 1, defgroup);
+  }
 }
 
 static void write_fmaps(WriteData *wd, ListBase *fbase)
 {
-	for (bFaceMap *fmap = fbase->first; fmap; fmap = fmap->next) {
-		writestruct(wd, DATA, bFaceMap, 1, fmap);
-	}
+  for (bFaceMap *fmap = fbase->first; fmap; fmap = fmap->next) {
+    writestruct(wd, DATA, bFaceMap, 1, fmap);
+  }
 }
 
 static void write_modifiers(WriteData *wd, ListBase *modbase)
 {
-	ModifierData *md;
-
-	if (modbase == NULL) {
-		return;
-	}
-
-	for (md = modbase->first; md; md = md->next) {
-		const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
-		if (mti == NULL) {
-			return;
-		}
-
-		writestruct_id(wd, DATA, mti->structName, 1, md);
-
-		if (md->type == eModifierType_Hook) {
-			HookModifierData *hmd = (HookModifierData *)md;
-
-			if (hmd->curfalloff) {
-				write_curvemapping(wd, hmd->curfalloff);
-			}
-
-			writedata(wd, DATA, sizeof(int) * hmd->totindex, hmd->indexar);
-		}
-		else if (md->type == eModifierType_Cloth) {
-			ClothModifierData *clmd = (ClothModifierData *)md;
-
-			writestruct(wd, DATA, ClothSimSettings, 1, clmd->sim_parms);
-			writestruct(wd, DATA, ClothCollSettings, 1, clmd->coll_parms);
-			writestruct(wd, DATA, EffectorWeights, 1, clmd->sim_parms->effector_weights);
-			write_pointcaches(wd, &clmd->ptcaches);
-		}
-		else if (md->type == eModifierType_Smoke) {
-			SmokeModifierData *smd = (SmokeModifierData *)md;
-
-			if (smd->type & MOD_SMOKE_TYPE_DOMAIN) {
-				writestruct(wd, DATA, SmokeDomainSettings, 1, smd->domain);
-
-				if (smd->domain) {
-					write_pointcaches(wd, &(smd->domain->ptcaches[0]));
-
-					/* create fake pointcache so that old blender versions can read it */
-					smd->domain->point_cache[1] = BKE_ptcache_add(&smd->domain->ptcaches[1]);
-					smd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE | PTCACHE_FAKE_SMOKE;
-					smd->domain->point_cache[1]->step = 1;
-
-					write_pointcaches(wd, &(smd->domain->ptcaches[1]));
-
-					if (smd->domain->coba) {
-						writestruct(wd, DATA, ColorBand, 1, smd->domain->coba);
-					}
-
-
-					/* cleanup the fake pointcache */
-					BKE_ptcache_free_list(&smd->domain->ptcaches[1]);
-					smd->domain->point_cache[1] = NULL;
-
-					writestruct(wd, DATA, EffectorWeights, 1, smd->domain->effector_weights);
-				}
-			}
-			else if (smd->type & MOD_SMOKE_TYPE_FLOW) {
-				writestruct(wd, DATA, SmokeFlowSettings, 1, smd->flow);
-			}
-			else if (smd->type & MOD_SMOKE_TYPE_COLL) {
-				writestruct(wd, DATA, SmokeCollSettings, 1, smd->coll);
-			}
-		}
-		else if (md->type == eModifierType_Fluidsim) {
-			FluidsimModifierData *fluidmd = (FluidsimModifierData *)md;
-
-			writestruct(wd, DATA, FluidsimSettings, 1, fluidmd->fss);
-		}
-		else if (md->type == eModifierType_DynamicPaint) {
-			DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
-
-			if (pmd->canvas) {
-				DynamicPaintSurface *surface;
-				writestruct(wd, DATA, DynamicPaintCanvasSettings, 1, pmd->canvas);
-
-				/* write surfaces */
-				for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
-					writestruct(wd, DATA, DynamicPaintSurface, 1, surface);
-				}
-				/* write caches and effector weights */
-				for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
-					write_pointcaches(wd, &(surface->ptcaches));
-
-					writestruct(wd, DATA, EffectorWeights, 1, surface->effector_weights);
-				}
-			}
-			if (pmd->brush) {
-				writestruct(wd, DATA, DynamicPaintBrushSettings, 1, pmd->brush);
-				writestruct(wd, DATA, ColorBand, 1, pmd->brush->paint_ramp);
-				writestruct(wd, DATA, ColorBand, 1, pmd->brush->vel_ramp);
-			}
-		}
-		else if (md->type == eModifierType_Collision) {
+  ModifierData *md;
+
+  if (modbase == NULL) {
+    return;
+  }
+
+  for (md = modbase->first; md; md = md->next) {
+    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    if (mti == NULL) {
+      return;
+    }
+
+    writestruct_id(wd, DATA, mti->structName, 1, md);
+
+    if (md->type == eModifierType_Hook) {
+      HookModifierData *hmd = (HookModifierData *)md;
+
+      if (hmd->curfalloff) {
+        write_curvemapping(wd, hmd->curfalloff);
+      }
+
+      writedata(wd, DATA, sizeof(int) * hmd->totindex, hmd->indexar);
+    }
+    else if (md->type == eModifierType_Cloth) {
+      ClothModifierData *clmd = (ClothModifierData *)md;
+
+      writestruct(wd, DATA, ClothSimSettings, 1, clmd->sim_parms);
+      writestruct(wd, DATA, ClothCollSettings, 1, clmd->coll_parms);
+      writestruct(wd, DATA, EffectorWeights, 1, clmd->sim_parms->effector_weights);
+      write_pointcaches(wd, &clmd->ptcaches);
+    }
+    else if (md->type == eModifierType_Smoke) {
+      SmokeModifierData *smd = (SmokeModifierData *)md;
+
+      if (smd->type & MOD_SMOKE_TYPE_DOMAIN) {
+        writestruct(wd, DATA, SmokeDomainSettings, 1, smd->domain);
+
+        if (smd->domain) {
+          write_pointcaches(wd, &(smd->domain->ptcaches[0]));
+
+          /* create fake pointcache so that old blender versions can read it */
+          smd->domain->point_cache[1] = BKE_ptcache_add(&smd->domain->ptcaches[1]);
+          smd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE | PTCACHE_FAKE_SMOKE;
+          smd->domain->point_cache[1]->step = 1;
+
+          write_pointcaches(wd, &(smd->domain->ptcaches[1]));
+
+          if (smd->domain->coba) {
+            writestruct(wd, DATA, ColorBand, 1, smd->domain->coba);
+          }
+
+          /* cleanup the fake pointcache */
+          BKE_ptcache_free_list(&smd->domain->ptcaches[1]);
+          smd->domain->point_cache[1] = NULL;
+
+          writestruct(wd, DATA, EffectorWeights, 1, smd->domain->effector_weights);
+        }
+      }
+      else if (smd->type & MOD_SMOKE_TYPE_FLOW) {
+        writestruct(wd, DATA, SmokeFlowSettings, 1, smd->flow);
+      }
+      else if (smd->type & MOD_SMOKE_TYPE_COLL) {
+        writestruct(wd, DATA, SmokeCollSettings, 1, smd->coll);
+      }
+    }
+    else if (md->type == eModifierType_Fluidsim) {
+      FluidsimModifierData *fluidmd = (FluidsimModifierData *)md;
+
+      writestruct(wd, DATA, FluidsimSettings, 1, fluidmd->fss);
+    }
+    else if (md->type == eModifierType_DynamicPaint) {
+      DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+
+      if (pmd->canvas) {
+        DynamicPaintSurface *surface;
+        writestruct(wd, DATA, DynamicPaintCanvasSettings, 1, pmd->canvas);
+
+        /* write surfaces */
+        for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
+          writestruct(wd, DATA, DynamicPaintSurface, 1, surface);
+        }
+        /* write caches and effector weights */
+        for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
+          write_pointcaches(wd, &(surface->ptcaches));
+
+          writestruct(wd, DATA, EffectorWeights, 1, surface->effector_weights);
+        }
+      }
+      if (pmd->brush) {
+        writestruct(wd, DATA, DynamicPaintBrushSettings, 1, pmd->brush);
+        writestruct(wd, DATA, ColorBand, 1, pmd->brush->paint_ramp);
+        writestruct(wd, DATA, ColorBand, 1, pmd->brush->vel_ramp);
+      }
+    }
+    else if (md->type == eModifierType_Collision) {
 
 #if 0
-			CollisionModifierData *collmd = (CollisionModifierData *)md;
-			// TODO: CollisionModifier should use pointcache
-			// + have proper reset events before enabling this
-			writestruct(wd, DATA, MVert, collmd->numverts, collmd->x);
-			writestruct(wd, DATA, MVert, collmd->numverts, collmd->xnew);
-			writestruct(wd, DATA, MFace, collmd->numfaces, collmd->mfaces);
+      CollisionModifierData *collmd = (CollisionModifierData *)md;
+      // TODO: CollisionModifier should use pointcache
+      // + have proper reset events before enabling this
+      writestruct(wd, DATA, MVert, collmd->numverts, collmd->x);
+      writestruct(wd, DATA, MVert, collmd->numverts, collmd->xnew);
+      writestruct(wd, DATA, MFace, collmd->numfaces, collmd->mfaces);
 #endif
-		}
-		else if (md->type == eModifierType_MeshDeform) {
-			MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
-			int size = mmd->dyngridsize;
-
-			writestruct(wd, DATA, MDefInfluence, mmd->totinfluence, mmd->bindinfluences);
-			writedata(wd, DATA, sizeof(int) * (mmd->totvert + 1), mmd->bindoffsets);
-			writedata(wd, DATA, sizeof(float) * 3 * mmd->totcagevert,
-			          mmd->bindcagecos);
-			writestruct(wd, DATA, MDefCell, size * size * size, mmd->dyngrid);
-			writestruct(wd, DATA, MDefInfluence, mmd->totinfluence, mmd->dyninfluences);
-			writedata(wd, DATA, sizeof(int) * mmd->totvert, mmd->dynverts);
-		}
-		else if (md->type == eModifierType_Warp) {
-			WarpModifierData *tmd = (WarpModifierData *)md;
-			if (tmd->curfalloff) {
-				write_curvemapping(wd, tmd->curfalloff);
-			}
-		}
-		else if (md->type == eModifierType_WeightVGEdit) {
-			WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
-
-			if (wmd->cmap_curve) {
-				write_curvemapping(wd, wmd->cmap_curve);
-			}
-		}
-		else if (md->type == eModifierType_LaplacianDeform) {
-			LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
-
-			writedata(wd, DATA, sizeof(float) * lmd->total_verts * 3, lmd->vertexco);
-		}
-		else if (md->type == eModifierType_CorrectiveSmooth) {
-			CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
-
-			if (csmd->bind_coords) {
-				writedata(wd, DATA, sizeof(float[3]) * csmd->bind_coords_num, csmd->bind_coords);
-			}
-		}
-		else if (md->type == eModifierType_SurfaceDeform) {
-			SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
-
-			writestruct(wd, DATA, SDefVert, smd->numverts, smd->verts);
-
-			if (smd->verts) {
-				for (int i = 0; i < smd->numverts; i++) {
-					writestruct(wd, DATA, SDefBind, smd->verts[i].numbinds, smd->verts[i].binds);
-
-					if (smd->verts[i].binds) {
-						for (int j = 0; j < smd->verts[i].numbinds; j++) {
-							writedata(wd, DATA, sizeof(int) * smd->verts[i].binds[j].numverts, smd->verts[i].binds[j].vert_inds);
-
-							if (smd->verts[i].binds[j].mode == MOD_SDEF_MODE_CENTROID ||
-							    smd->verts[i].binds[j].mode == MOD_SDEF_MODE_LOOPTRI)
-							{
-								writedata(wd, DATA, sizeof(float) * 3, smd->verts[i].binds[j].vert_weights);
-							}
-							else {
-								writedata(wd, DATA, sizeof(float) * smd->verts[i].binds[j].numverts, smd->verts[i].binds[j].vert_weights);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+    }
+    else if (md->type == eModifierType_MeshDeform) {
+      MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
+      int size = mmd->dyngridsize;
+
+      writestruct(wd, DATA, MDefInfluence, mmd->totinfluence, mmd->bindinfluences);
+      writedata(wd, DATA, sizeof(int) * (mmd->totvert + 1), mmd->bindoffsets);
+      writedata(wd, DATA, sizeof(float) * 3 * mmd->totcagevert, mmd->bindcagecos);
+      writestruct(wd, DATA, MDefCell, size * size * size, mmd->dyngrid);
+      writestruct(wd, DATA, MDefInfluence, mmd->totinfluence, mmd->dyninfluences);
+      writedata(wd, DATA, sizeof(int) * mmd->totvert, mmd->dynverts);
+    }
+    else if (md->type == eModifierType_Warp) {
+      WarpModifierData *tmd = (WarpModifierData *)md;
+      if (tmd->curfalloff) {
+        write_curvemapping(wd, tmd->curfalloff);
+      }
+    }
+    else if (md->type == eModifierType_WeightVGEdit) {
+      WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
+
+      if (wmd->cmap_curve) {
+        write_curvemapping(wd, wmd->cmap_curve);
+      }
+    }
+    else if (md->type == eModifierType_LaplacianDeform) {
+      LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
+
+      writedata(wd, DATA, sizeof(float) * lmd->total_verts * 3, lmd->vertexco);
+    }
+    else if (md->type == eModifierType_CorrectiveSmooth) {
+      CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
+
+      if (csmd->bind_coords) {
+        writedata(wd, DATA, sizeof(float[3]) * csmd->bind_coords_num, csmd->bind_coords);
+      }
+    }
+    else if (md->type == eModifierType_SurfaceDeform) {
+      SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
+
+      writestruct(wd, DATA, SDefVert, smd->numverts, smd->verts);
+
+      if (smd->verts) {
+        for (int i = 0; i < smd->numverts; i++) {
+          writestruct(wd, DATA, SDefBind, smd->verts[i].numbinds, smd->verts[i].binds);
+
+          if (smd->verts[i].binds) {
+            for (int j = 0; j < smd->verts[i].numbinds; j++) {
+              writedata(wd,
+                        DATA,
+                        sizeof(int) * smd->verts[i].binds[j].numverts,
+                        smd->verts[i].binds[j].vert_inds);
+
+              if (smd->verts[i].binds[j].mode == MOD_SDEF_MODE_CENTROID ||
+                  smd->verts[i].binds[j].mode == MOD_SDEF_MODE_LOOPTRI) {
+                writedata(wd, DATA, sizeof(float) * 3, smd->verts[i].binds[j].vert_weights);
+              }
+              else {
+                writedata(wd,
+                          DATA,
+                          sizeof(float) * smd->verts[i].binds[j].numverts,
+                          smd->verts[i].binds[j].vert_weights);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 static void write_gpencil_modifiers(WriteData *wd, ListBase *modbase)
 {
-	GpencilModifierData *md;
-
-	if (modbase == NULL) {
-		return;
-	}
-
-	for (md = modbase->first; md; md = md->next) {
-		const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
-		if (mti == NULL) {
-			return;
-		}
-
-		writestruct_id(wd, DATA, mti->struct_name, 1, md);
-
-		if (md->type == eGpencilModifierType_Thick) {
-			ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
-
-			if (gpmd->curve_thickness) {
-				write_curvemapping(wd, gpmd->curve_thickness);
-			}
-		}
-		else if (md->type == eGpencilModifierType_Hook) {
-			HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
-
-			if (gpmd->curfalloff) {
-				write_curvemapping(wd, gpmd->curfalloff);
-			}
-		}
-	}
+  GpencilModifierData *md;
+
+  if (modbase == NULL) {
+    return;
+  }
+
+  for (md = modbase->first; md; md = md->next) {
+    const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
+    if (mti == NULL) {
+      return;
+    }
+
+    writestruct_id(wd, DATA, mti->struct_name, 1, md);
+
+    if (md->type == eGpencilModifierType_Thick) {
+      ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
+
+      if (gpmd->curve_thickness) {
+        write_curvemapping(wd, gpmd->curve_thickness);
+      }
+    }
+    else if (md->type == eGpencilModifierType_Hook) {
+      HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
+
+      if (gpmd->curfalloff) {
+        write_curvemapping(wd, gpmd->curfalloff);
+      }
+    }
+  }
 }
 
 static void write_shaderfxs(WriteData *wd, ListBase *fxbase)
 {
-	ShaderFxData *fx;
+  ShaderFxData *fx;
 
-	if (fxbase == NULL) {
-		return;
-	}
+  if (fxbase == NULL) {
+    return;
+  }
 
-	for (fx = fxbase->first; fx; fx = fx->next) {
-		const ShaderFxTypeInfo *fxi = BKE_shaderfxType_getInfo(fx->type);
-		if (fxi == NULL) {
-			return;
-		}
+  for (fx = fxbase->first; fx; fx = fx->next) {
+    const ShaderFxTypeInfo *fxi = BKE_shaderfxType_getInfo(fx->type);
+    if (fxi == NULL) {
+      return;
+    }
 
-		writestruct_id(wd, DATA, fxi->struct_name, 1, fx);
-	}
+    writestruct_id(wd, DATA, fxi->struct_name, 1, fx);
+  }
 }
 
 static void write_object(WriteData *wd, Object *ob)
 {
-	if (ob->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_OB, Object, 1, ob);
-		write_iddata(wd, &ob->id);
-
-		if (ob->adt) {
-			write_animdata(wd, ob->adt);
-		}
-
-		/* direct data */
-		writedata(wd, DATA, sizeof(void *) * ob->totcol, ob->mat);
-		writedata(wd, DATA, sizeof(char) * ob->totcol, ob->matbits);
-		/* write_effects(wd, &ob->effect); */ /* not used anymore */
-
-		if (ob->type == OB_ARMATURE) {
-			bArmature *arm = ob->data;
-			if (arm && ob->pose && arm->act_bone) {
-				BLI_strncpy(ob->pose->proxy_act_bone, arm->act_bone->name, sizeof(ob->pose->proxy_act_bone));
-			}
-		}
-
-		write_pose(wd, ob->pose);
-		write_defgroups(wd, &ob->defbase);
-		write_fmaps(wd, &ob->fmaps);
-		write_constraints(wd, &ob->constraints);
-		write_motionpath(wd, ob->mpath);
-
-		writestruct(wd, DATA, PartDeflect, 1, ob->pd);
-		if (ob->soft) {
-			/* Set deprecated pointers to prevent crashes of older Blenders */
-			ob->soft->pointcache = ob->soft->shared->pointcache;
-			ob->soft->ptcaches = ob->soft->shared->ptcaches;
-			writestruct(wd, DATA, SoftBody, 1, ob->soft);
-			writestruct(wd, DATA, SoftBody_Shared, 1, ob->soft->shared);
-			write_pointcaches(wd, &(ob->soft->shared->ptcaches));
-			writestruct(wd, DATA, EffectorWeights, 1, ob->soft->effector_weights);
-		}
-
-		if (ob->rigidbody_object) {
-			/* TODO: if any extra data is added to handle duplis, will need separate function then */
-			writestruct(wd, DATA, RigidBodyOb, 1, ob->rigidbody_object);
-		}
-		if (ob->rigidbody_constraint) {
-			writestruct(wd, DATA, RigidBodyCon, 1, ob->rigidbody_constraint);
-		}
-
-		if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
-			writestruct(wd, DATA, ImageUser, 1, ob->iuser);
-		}
-
-		write_particlesystems(wd, &ob->particlesystem);
-		write_modifiers(wd, &ob->modifiers);
-		write_gpencil_modifiers(wd, &ob->greasepencil_modifiers);
-		write_shaderfxs(wd, &ob->shader_fx);
-
-		writelist(wd, DATA, LinkData, &ob->pc_ids);
-		writelist(wd, DATA, LodLevel, &ob->lodlevels);
-
-		write_previews(wd, ob->preview);
-	}
+  if (ob->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_OB, Object, 1, ob);
+    write_iddata(wd, &ob->id);
+
+    if (ob->adt) {
+      write_animdata(wd, ob->adt);
+    }
+
+    /* direct data */
+    writedata(wd, DATA, sizeof(void *) * ob->totcol, ob->mat);
+    writedata(wd, DATA, sizeof(char) * ob->totcol, ob->matbits);
+    /* write_effects(wd, &ob->effect); */ /* not used anymore */
+
+    if (ob->type == OB_ARMATURE) {
+      bArmature *arm = ob->data;
+      if (arm && ob->pose && arm->act_bone) {
+        BLI_strncpy(
+            ob->pose->proxy_act_bone, arm->act_bone->name, sizeof(ob->pose->proxy_act_bone));
+      }
+    }
+
+    write_pose(wd, ob->pose);
+    write_defgroups(wd, &ob->defbase);
+    write_fmaps(wd, &ob->fmaps);
+    write_constraints(wd, &ob->constraints);
+    write_motionpath(wd, ob->mpath);
+
+    writestruct(wd, DATA, PartDeflect, 1, ob->pd);
+    if (ob->soft) {
+      /* Set deprecated pointers to prevent crashes of older Blenders */
+      ob->soft->pointcache = ob->soft->shared->pointcache;
+      ob->soft->ptcaches = ob->soft->shared->ptcaches;
+      writestruct(wd, DATA, SoftBody, 1, ob->soft);
+      writestruct(wd, DATA, SoftBody_Shared, 1, ob->soft->shared);
+      write_pointcaches(wd, &(ob->soft->shared->ptcaches));
+      writestruct(wd, DATA, EffectorWeights, 1, ob->soft->effector_weights);
+    }
+
+    if (ob->rigidbody_object) {
+      /* TODO: if any extra data is added to handle duplis, will need separate function then */
+      writestruct(wd, DATA, RigidBodyOb, 1, ob->rigidbody_object);
+    }
+    if (ob->rigidbody_constraint) {
+      writestruct(wd, DATA, RigidBodyCon, 1, ob->rigidbody_constraint);
+    }
+
+    if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
+      writestruct(wd, DATA, ImageUser, 1, ob->iuser);
+    }
+
+    write_particlesystems(wd, &ob->particlesystem);
+    write_modifiers(wd, &ob->modifiers);
+    write_gpencil_modifiers(wd, &ob->greasepencil_modifiers);
+    write_shaderfxs(wd, &ob->shader_fx);
+
+    writelist(wd, DATA, LinkData, &ob->pc_ids);
+    writelist(wd, DATA, LodLevel, &ob->lodlevels);
+
+    write_previews(wd, ob->preview);
+  }
 }
 
-
 static void write_vfont(WriteData *wd, VFont *vf)
 {
-	if (vf->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_VF, VFont, 1, vf);
-		write_iddata(wd, &vf->id);
-
-		/* direct data */
-		if (vf->packedfile) {
-			PackedFile *pf = vf->packedfile;
-			writestruct(wd, DATA, PackedFile, 1, pf);
-			writedata(wd, DATA, pf->size, pf->data);
-		}
-	}
+  if (vf->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_VF, VFont, 1, vf);
+    write_iddata(wd, &vf->id);
+
+    /* direct data */
+    if (vf->packedfile) {
+      PackedFile *pf = vf->packedfile;
+      writestruct(wd, DATA, PackedFile, 1, pf);
+      writedata(wd, DATA, pf->size, pf->data);
+    }
+  }
 }
 
-
 static void write_key(WriteData *wd, Key *key)
 {
-	if (key->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_KE, Key, 1, key);
-		write_iddata(wd, &key->id);
-
-		if (key->adt) {
-			write_animdata(wd, key->adt);
-		}
-
-		/* direct data */
-		for (KeyBlock *kb = key->block.first; kb; kb = kb->next) {
-			writestruct(wd, DATA, KeyBlock, 1, kb);
-			if (kb->data) {
-				writedata(wd, DATA, kb->totelem * key->elemsize, kb->data);
-			}
-		}
-	}
+  if (key->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_KE, Key, 1, key);
+    write_iddata(wd, &key->id);
+
+    if (key->adt) {
+      write_animdata(wd, key->adt);
+    }
+
+    /* direct data */
+    for (KeyBlock *kb = key->block.first; kb; kb = kb->next) {
+      writestruct(wd, DATA, KeyBlock, 1, kb);
+      if (kb->data) {
+        writedata(wd, DATA, kb->totelem * key->elemsize, kb->data);
+      }
+    }
+  }
 }
 
 static void write_camera(WriteData *wd, Camera *cam)
 {
-	if (cam->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_CA, Camera, 1, cam);
-		write_iddata(wd, &cam->id);
-
-		if (cam->adt) {
-			write_animdata(wd, cam->adt);
-		}
-
-		for (CameraBGImage *bgpic = cam->bg_images.first; bgpic; bgpic = bgpic->next) {
-			writestruct(wd, DATA, CameraBGImage, 1, bgpic);
-		}
-	}
+  if (cam->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_CA, Camera, 1, cam);
+    write_iddata(wd, &cam->id);
+
+    if (cam->adt) {
+      write_animdata(wd, cam->adt);
+    }
+
+    for (CameraBGImage *bgpic = cam->bg_images.first; bgpic; bgpic = bgpic->next) {
+      writestruct(wd, DATA, CameraBGImage, 1, bgpic);
+    }
+  }
 }
 
 static void write_mball(WriteData *wd, MetaBall *mb)
 {
-	if (mb->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_MB, MetaBall, 1, mb);
-		write_iddata(wd, &mb->id);
-
-		/* direct data */
-		writedata(wd, DATA, sizeof(void *) * mb->totcol, mb->mat);
-		if (mb->adt) {
-			write_animdata(wd, mb->adt);
-		}
-
-		for (MetaElem *ml = mb->elems.first; ml; ml = ml->next) {
-			writestruct(wd, DATA, MetaElem, 1, ml);
-		}
-	}
+  if (mb->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_MB, MetaBall, 1, mb);
+    write_iddata(wd, &mb->id);
+
+    /* direct data */
+    writedata(wd, DATA, sizeof(void *) * mb->totcol, mb->mat);
+    if (mb->adt) {
+      write_animdata(wd, mb->adt);
+    }
+
+    for (MetaElem *ml = mb->elems.first; ml; ml = ml->next) {
+      writestruct(wd, DATA, MetaElem, 1, ml);
+    }
+  }
 }
 
 static void write_curve(WriteData *wd, Curve *cu)
 {
-	if (cu->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_CU, Curve, 1, cu);
-		write_iddata(wd, &cu->id);
-
-		/* direct data */
-		writedata(wd, DATA, sizeof(void *) * cu->totcol, cu->mat);
-		if (cu->adt) {
-			write_animdata(wd, cu->adt);
-		}
-
-		if (cu->vfont) {
-			writedata(wd, DATA, cu->len + 1, cu->str);
-			writestruct(wd, DATA, CharInfo, cu->len_wchar + 1, cu->strinfo);
-			writestruct(wd, DATA, TextBox, cu->totbox, cu->tb);
-		}
-		else {
-			/* is also the order of reading */
-			for (Nurb *nu = cu->nurb.first; nu; nu = nu->next) {
-				writestruct(wd, DATA, Nurb, 1, nu);
-			}
-			for (Nurb *nu = cu->nurb.first; nu; nu = nu->next) {
-				if (nu->type == CU_BEZIER) {
-					writestruct(wd, DATA, BezTriple, nu->pntsu, nu->bezt);
-				}
-				else {
-					writestruct(wd, DATA, BPoint, nu->pntsu * nu->pntsv, nu->bp);
-					if (nu->knotsu) {
-						writedata(wd, DATA, KNOTSU(nu) * sizeof(float), nu->knotsu);
-					}
-					if (nu->knotsv) {
-						writedata(wd, DATA, KNOTSV(nu) * sizeof(float), nu->knotsv);
-					}
-				}
-			}
-		}
-	}
+  if (cu->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_CU, Curve, 1, cu);
+    write_iddata(wd, &cu->id);
+
+    /* direct data */
+    writedata(wd, DATA, sizeof(void *) * cu->totcol, cu->mat);
+    if (cu->adt) {
+      write_animdata(wd, cu->adt);
+    }
+
+    if (cu->vfont) {
+      writedata(wd, DATA, cu->len + 1, cu->str);
+      writestruct(wd, DATA, CharInfo, cu->len_wchar + 1, cu->strinfo);
+      writestruct(wd, DATA, TextBox, cu->totbox, cu->tb);
+    }
+    else {
+      /* is also the order of reading */
+      for (Nurb *nu = cu->nurb.first; nu; nu = nu->next) {
+        writestruct(wd, DATA, Nurb, 1, nu);
+      }
+      for (Nurb *nu = cu->nurb.first; nu; nu = nu->next) {
+        if (nu->type == CU_BEZIER) {
+          writestruct(wd, DATA, BezTriple, nu->pntsu, nu->bezt);
+        }
+        else {
+          writestruct(wd, DATA, BPoint, nu->pntsu * nu->pntsv, nu->bp);
+          if (nu->knotsu) {
+            writedata(wd, DATA, KNOTSU(nu) * sizeof(float), nu->knotsu);
+          }
+          if (nu->knotsv) {
+            writedata(wd, DATA, KNOTSV(nu) * sizeof(float), nu->knotsv);
+          }
+        }
+      }
+    }
+  }
 }
 
 static void write_dverts(WriteData *wd, int count, MDeformVert *dvlist)
 {
-	if (dvlist) {
-
-		/* Write the dvert list */
-		writestruct(wd, DATA, MDeformVert, count, dvlist);
-
-		/* Write deformation data for each dvert */
-		for (int i = 0; i < count; i++) {
-			if (dvlist[i].dw) {
-				writestruct(wd, DATA, MDeformWeight, dvlist[i].totweight, dvlist[i].dw);
-			}
-		}
-	}
+  if (dvlist) {
+
+    /* Write the dvert list */
+    writestruct(wd, DATA, MDeformVert, count, dvlist);
+
+    /* Write deformation data for each dvert */
+    for (int i = 0; i < count; i++) {
+      if (dvlist[i].dw) {
+        writestruct(wd, DATA, MDeformWeight, dvlist[i].totweight, dvlist[i].dw);
+      }
+    }
+  }
 }
 
 static void write_mdisps(WriteData *wd, int count, MDisps *mdlist, int external)
 {
-	if (mdlist) {
-		int i;
-
-		writestruct(wd, DATA, MDisps, count, mdlist);
-		for (i = 0; i < count; ++i) {
-			MDisps *md = &mdlist[i];
-			if (md->disps) {
-				if (!external) {
-					writedata(wd, DATA, sizeof(float) * 3 * md->totdisp, md->disps);
-				}
-			}
-
-			if (md->hidden) {
-				writedata(wd, DATA, BLI_BITMAP_SIZE(md->totdisp), md->hidden);
-			}
-		}
-	}
+  if (mdlist) {
+    int i;
+
+    writestruct(wd, DATA, MDisps, count, mdlist);
+    for (i = 0; i < count; ++i) {
+      MDisps *md = &mdlist[i];
+      if (md->disps) {
+        if (!external) {
+          writedata(wd, DATA, sizeof(float) * 3 * md->totdisp, md->disps);
+        }
+      }
+
+      if (md->hidden) {
+        writedata(wd, DATA, BLI_BITMAP_SIZE(md->totdisp), md->hidden);
+      }
+    }
+  }
 }
 
 static void write_grid_paint_mask(WriteData *wd, int count, GridPaintMask *grid_paint_mask)
 {
-	if (grid_paint_mask) {
-		int i;
-
-		writestruct(wd, DATA, GridPaintMask, count, grid_paint_mask);
-		for (i = 0; i < count; ++i) {
-			GridPaintMask *gpm = &grid_paint_mask[i];
-			if (gpm->data) {
-				const int gridsize = BKE_ccg_gridsize(gpm->level);
-				writedata(wd, DATA,
-				          sizeof(*gpm->data) * gridsize * gridsize,
-				          gpm->data);
-			}
-		}
-	}
+  if (grid_paint_mask) {
+    int i;
+
+    writestruct(wd, DATA, GridPaintMask, count, grid_paint_mask);
+    for (i = 0; i < count; ++i) {
+      GridPaintMask *gpm = &grid_paint_mask[i];
+      if (gpm->data) {
+        const int gridsize = BKE_ccg_gridsize(gpm->level);
+        writedata(wd, DATA, sizeof(*gpm->data) * gridsize * gridsize, gpm->data);
+      }
+    }
+  }
 }
 
-static void write_customdata(
-        WriteData *wd, ID *id,
-        int count, CustomData *data, CustomDataLayer *layers, CustomDataMask cddata_mask,
-        int partial_type, int partial_count)
+static void write_customdata(WriteData *wd,
+                             ID *id,
+                             int count,
+                             CustomData *data,
+                             CustomDataLayer *layers,
+                             CustomDataMask cddata_mask,
+                             int partial_type,
+                             int partial_count)
 {
-	int i;
-
-	/* write external customdata (not for undo) */
-	if (data->external && (wd->use_memfile == false)) {
-		CustomData_external_write(data, id, cddata_mask, count, 0);
-	}
-
-	writestruct_at_address(wd, DATA, CustomDataLayer, data->totlayer, data->layers, layers);
-
-	for (i = 0; i < data->totlayer; i++) {
-		CustomDataLayer *layer = &layers[i];
-		const char *structname;
-		int structnum, datasize;
-
-		if (layer->type == CD_MDEFORMVERT) {
-			/* layer types that allocate own memory need special handling */
-			write_dverts(wd, count, layer->data);
-		}
-		else if (layer->type == CD_MDISPS) {
-			write_mdisps(wd, count, layer->data, layer->flag & CD_FLAG_EXTERNAL);
-		}
-		else if (layer->type == CD_PAINT_MASK) {
-			const float *layer_data = layer->data;
-			writedata(wd, DATA, sizeof(*layer_data) * count, layer_data);
-		}
-		else if (layer->type == CD_GRID_PAINT_MASK) {
-			write_grid_paint_mask(wd, count, layer->data);
-		}
-		else if (layer->type == CD_FACEMAP) {
-			const int *layer_data = layer->data;
-			writedata(wd, DATA, sizeof(*layer_data) * count, layer_data);
-		}
-		else {
-			CustomData_file_write_info(layer->type, &structname, &structnum);
-			if (structnum) {
-				/* when using partial visibility, the MEdge and MFace layers
-				 * are smaller than the original, so their type and count is
-				 * passed to make this work */
-				if (layer->type != partial_type) {
-					datasize = structnum * count;
-				}
-				else {
-					datasize = structnum * partial_count;
-				}
-
-				writestruct_id(wd, DATA, structname, datasize, layer->data);
-			}
-			else {
-				printf("%s error: layer '%s':%d - can't be written to file\n",
-				       __func__, structname, layer->type);
-			}
-		}
-	}
-
-	if (data->external) {
-		writestruct(wd, DATA, CustomDataExternal, 1, data->external);
-	}
+  int i;
+
+  /* write external customdata (not for undo) */
+  if (data->external && (wd->use_memfile == false)) {
+    CustomData_external_write(data, id, cddata_mask, count, 0);
+  }
+
+  writestruct_at_address(wd, DATA, CustomDataLayer, data->totlayer, data->layers, layers);
+
+  for (i = 0; i < data->totlayer; i++) {
+    CustomDataLayer *layer = &layers[i];
+    const char *structname;
+    int structnum, datasize;
+
+    if (layer->type == CD_MDEFORMVERT) {
+      /* layer types that allocate own memory need special handling */
+      write_dverts(wd, count, layer->data);
+    }
+    else if (layer->type == CD_MDISPS) {
+      write_mdisps(wd, count, layer->data, layer->flag & CD_FLAG_EXTERNAL);
+    }
+    else if (layer->type == CD_PAINT_MASK) {
+      const float *layer_data = layer->data;
+      writedata(wd, DATA, sizeof(*layer_data) * count, layer_data);
+    }
+    else if (layer->type == CD_GRID_PAINT_MASK) {
+      write_grid_paint_mask(wd, count, layer->data);
+    }
+    else if (layer->type == CD_FACEMAP) {
+      const int *layer_data = layer->data;
+      writedata(wd, DATA, sizeof(*layer_data) * count, layer_data);
+    }
+    else {
+      CustomData_file_write_info(layer->type, &structname, &structnum);
+      if (structnum) {
+        /* when using partial visibility, the MEdge and MFace layers
+         * are smaller than the original, so their type and count is
+         * passed to make this work */
+        if (layer->type != partial_type) {
+          datasize = structnum * count;
+        }
+        else {
+          datasize = structnum * partial_count;
+        }
+
+        writestruct_id(wd, DATA, structname, datasize, layer->data);
+      }
+      else {
+        printf("%s error: layer '%s':%d - can't be written to file\n",
+               __func__,
+               structname,
+               layer->type);
+      }
+    }
+  }
+
+  if (data->external) {
+    writestruct(wd, DATA, CustomDataExternal, 1, data->external);
+  }
 }
 
 static void write_mesh(WriteData *wd, Mesh *mesh)
 {
-	CustomDataLayer *vlayers = NULL, vlayers_buff[CD_TEMP_CHUNK_SIZE];
-	CustomDataLayer *elayers = NULL, elayers_buff[CD_TEMP_CHUNK_SIZE];
-	CustomDataLayer *flayers = NULL, flayers_buff[CD_TEMP_CHUNK_SIZE];
-	CustomDataLayer *llayers = NULL, llayers_buff[CD_TEMP_CHUNK_SIZE];
-	CustomDataLayer *players = NULL, players_buff[CD_TEMP_CHUNK_SIZE];
-
-	if (mesh->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		{
-			/* write a copy of the mesh, don't modify in place because it is
-			 * not thread safe for threaded renders that are reading this */
-			Mesh *old_mesh = mesh;
-			Mesh copy_mesh = *mesh;
-			mesh = &copy_mesh;
-
-			/* cache only - don't write */
-			mesh->mface = NULL;
-			mesh->totface = 0;
-			memset(&mesh->fdata, 0, sizeof(mesh->fdata));
-
-			/**
-			 * Those calls:
-			 *   - Reduce mesh->xdata.totlayer to number of layers to write.
-			 *   - Fill xlayers with those layers to be written.
-			 * Note that mesh->xdata is from now on invalid for Blender, but this is why the whole mesh is
-			 * a temp local copy!
-			 */
-			CustomData_file_write_prepare(&mesh->vdata, &vlayers, vlayers_buff, ARRAY_SIZE(vlayers_buff));
-			CustomData_file_write_prepare(&mesh->edata, &elayers, elayers_buff, ARRAY_SIZE(elayers_buff));
-			flayers = flayers_buff;
-			CustomData_file_write_prepare(&mesh->ldata, &llayers, llayers_buff, ARRAY_SIZE(llayers_buff));
-			CustomData_file_write_prepare(&mesh->pdata, &players, players_buff, ARRAY_SIZE(players_buff));
-
-			writestruct_at_address(wd, ID_ME, Mesh, 1, old_mesh, mesh);
-			write_iddata(wd, &mesh->id);
-
-			/* direct data */
-			if (mesh->adt) {
-				write_animdata(wd, mesh->adt);
-			}
-
-			writedata(wd, DATA, sizeof(void *) * mesh->totcol, mesh->mat);
-			writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect);
-
-			write_customdata(wd, &mesh->id, mesh->totvert, &mesh->vdata, vlayers, CD_MASK_MESH.vmask, -1, 0);
-			write_customdata(wd, &mesh->id, mesh->totedge, &mesh->edata, elayers, CD_MASK_MESH.emask, -1, 0);
-			/* fdata is really a dummy - written so slots align */
-			write_customdata(wd, &mesh->id, mesh->totface, &mesh->fdata, flayers, CD_MASK_MESH.fmask, -1, 0);
-			write_customdata(wd, &mesh->id, mesh->totloop, &mesh->ldata, llayers, CD_MASK_MESH.lmask, -1, 0);
-			write_customdata(wd, &mesh->id, mesh->totpoly, &mesh->pdata, players, CD_MASK_MESH.pmask, -1, 0);
-
-			/* restore pointer */
-			mesh = old_mesh;
-		}
-	}
-
-	if (vlayers && vlayers != vlayers_buff) {
-		MEM_freeN(vlayers);
-	}
-	if (elayers && elayers != elayers_buff) {
-		MEM_freeN(elayers);
-	}
-	if (flayers && flayers != flayers_buff) {
-		MEM_freeN(flayers);
-	}
-	if (llayers && llayers != llayers_buff) {
-		MEM_freeN(llayers);
-	}
-	if (players && players != players_buff) {
-		MEM_freeN(players);
-	}
+  CustomDataLayer *vlayers = NULL, vlayers_buff[CD_TEMP_CHUNK_SIZE];
+  CustomDataLayer *elayers = NULL, elayers_buff[CD_TEMP_CHUNK_SIZE];
+  CustomDataLayer *flayers = NULL, flayers_buff[CD_TEMP_CHUNK_SIZE];
+  CustomDataLayer *llayers = NULL, llayers_buff[CD_TEMP_CHUNK_SIZE];
+  CustomDataLayer *players = NULL, players_buff[CD_TEMP_CHUNK_SIZE];
+
+  if (mesh->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    {
+      /* write a copy of the mesh, don't modify in place because it is
+       * not thread safe for threaded renders that are reading this */
+      Mesh *old_mesh = mesh;
+      Mesh copy_mesh = *mesh;
+      mesh = &copy_mesh;
+
+      /* cache only - don't write */
+      mesh->mface = NULL;
+      mesh->totface = 0;
+      memset(&mesh->fdata, 0, sizeof(mesh->fdata));
+
+      /**
+       * Those calls:
+       *   - Reduce mesh->xdata.totlayer to number of layers to write.
+       *   - Fill xlayers with those layers to be written.
+       * Note that mesh->xdata is from now on invalid for Blender, but this is why the whole mesh is
+       * a temp local copy!
+       */
+      CustomData_file_write_prepare(
+          &mesh->vdata, &vlayers, vlayers_buff, ARRAY_SIZE(vlayers_buff));
+      CustomData_file_write_prepare(
+          &mesh->edata, &elayers, elayers_buff, ARRAY_SIZE(elayers_buff));
+      flayers = flayers_buff;
+      CustomData_file_write_prepare(
+          &mesh->ldata, &llayers, llayers_buff, ARRAY_SIZE(llayers_buff));
+      CustomData_file_write_prepare(
+          &mesh->pdata, &players, players_buff, ARRAY_SIZE(players_buff));
+
+      writestruct_at_address(wd, ID_ME, Mesh, 1, old_mesh, mesh);
+      write_iddata(wd, &mesh->id);
+
+      /* direct data */
+      if (mesh->adt) {
+        write_animdata(wd, mesh->adt);
+      }
+
+      writedata(wd, DATA, sizeof(void *) * mesh->totcol, mesh->mat);
+      writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect);
+
+      write_customdata(
+          wd, &mesh->id, mesh->totvert, &mesh->vdata, vlayers, CD_MASK_MESH.vmask, -1, 0);
+      write_customdata(
+          wd, &mesh->id, mesh->totedge, &mesh->edata, elayers, CD_MASK_MESH.emask, -1, 0);
+      /* fdata is really a dummy - written so slots align */
+      write_customdata(
+          wd, &mesh->id, mesh->totface, &mesh->fdata, flayers, CD_MASK_MESH.fmask, -1, 0);
+      write_customdata(
+          wd, &mesh->id, mesh->totloop, &mesh->ldata, llayers, CD_MASK_MESH.lmask, -1, 0);
+      write_customdata(
+          wd, &mesh->id, mesh->totpoly, &mesh->pdata, players, CD_MASK_MESH.pmask, -1, 0);
+
+      /* restore pointer */
+      mesh = old_mesh;
+    }
+  }
+
+  if (vlayers && vlayers != vlayers_buff) {
+    MEM_freeN(vlayers);
+  }
+  if (elayers && elayers != elayers_buff) {
+    MEM_freeN(elayers);
+  }
+  if (flayers && flayers != flayers_buff) {
+    MEM_freeN(flayers);
+  }
+  if (llayers && llayers != llayers_buff) {
+    MEM_freeN(llayers);
+  }
+  if (players && players != players_buff) {
+    MEM_freeN(players);
+  }
 }
 
 static void write_lattice(WriteData *wd, Lattice *lt)
 {
-	if (lt->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_LT, Lattice, 1, lt);
-		write_iddata(wd, &lt->id);
+  if (lt->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_LT, Lattice, 1, lt);
+    write_iddata(wd, &lt->id);
 
-		/* write animdata */
-		if (lt->adt) {
-			write_animdata(wd, lt->adt);
-		}
+    /* write animdata */
+    if (lt->adt) {
+      write_animdata(wd, lt->adt);
+    }
 
-		/* direct data */
-		writestruct(wd, DATA, BPoint, lt->pntsu * lt->pntsv * lt->pntsw, lt->def);
+    /* direct data */
+    writestruct(wd, DATA, BPoint, lt->pntsu * lt->pntsv * lt->pntsw, lt->def);
 
-		write_dverts(wd, lt->pntsu * lt->pntsv * lt->pntsw, lt->dvert);
-	}
+    write_dverts(wd, lt->pntsu * lt->pntsv * lt->pntsw, lt->dvert);
+  }
 }
 
 static void write_image(WriteData *wd, Image *ima)
 {
-	if (ima->id.us > 0 || wd->use_memfile) {
-		ImagePackedFile *imapf;
-
-		/* Some trickery to keep forward compatibility of packed images. */
-		BLI_assert(ima->packedfile == NULL);
-		if (ima->packedfiles.first != NULL) {
-			imapf = ima->packedfiles.first;
-			ima->packedfile = imapf->packedfile;
-		}
-
-		/* write LibData */
-		writestruct(wd, ID_IM, Image, 1, ima);
-		write_iddata(wd, &ima->id);
-
-		for (imapf = ima->packedfiles.first; imapf; imapf = imapf->next) {
-			writestruct(wd, DATA, ImagePackedFile, 1, imapf);
-			if (imapf->packedfile) {
-				PackedFile *pf = imapf->packedfile;
-				writestruct(wd, DATA, PackedFile, 1, pf);
-				writedata(wd, DATA, pf->size, pf->data);
-			}
-		}
-
-		write_previews(wd, ima->preview);
-
-		for (ImageView *iv = ima->views.first; iv; iv = iv->next) {
-			writestruct(wd, DATA, ImageView, 1, iv);
-		}
-		writestruct(wd, DATA, Stereo3dFormat, 1, ima->stereo3d_format);
-
-		ima->packedfile = NULL;
-
-		writelist(wd, DATA, RenderSlot, &ima->renderslots);
-	}
+  if (ima->id.us > 0 || wd->use_memfile) {
+    ImagePackedFile *imapf;
+
+    /* Some trickery to keep forward compatibility of packed images. */
+    BLI_assert(ima->packedfile == NULL);
+    if (ima->packedfiles.first != NULL) {
+      imapf = ima->packedfiles.first;
+      ima->packedfile = imapf->packedfile;
+    }
+
+    /* write LibData */
+    writestruct(wd, ID_IM, Image, 1, ima);
+    write_iddata(wd, &ima->id);
+
+    for (imapf = ima->packedfiles.first; imapf; imapf = imapf->next) {
+      writestruct(wd, DATA, ImagePackedFile, 1, imapf);
+      if (imapf->packedfile) {
+        PackedFile *pf = imapf->packedfile;
+        writestruct(wd, DATA, PackedFile, 1, pf);
+        writedata(wd, DATA, pf->size, pf->data);
+      }
+    }
+
+    write_previews(wd, ima->preview);
+
+    for (ImageView *iv = ima->views.first; iv; iv = iv->next) {
+      writestruct(wd, DATA, ImageView, 1, iv);
+    }
+    writestruct(wd, DATA, Stereo3dFormat, 1, ima->stereo3d_format);
+
+    ima->packedfile = NULL;
+
+    writelist(wd, DATA, RenderSlot, &ima->renderslots);
+  }
 }
 
 static void write_texture(WriteData *wd, Tex *tex)
 {
-	if (tex->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_TE, Tex, 1, tex);
-		write_iddata(wd, &tex->id);
-
-		if (tex->adt) {
-			write_animdata(wd, tex->adt);
-		}
-
-		/* direct data */
-		if (tex->coba) {
-			writestruct(wd, DATA, ColorBand, 1, tex->coba);
-		}
-
-		/* nodetree is integral part of texture, no libdata */
-		if (tex->nodetree) {
-			writestruct(wd, DATA, bNodeTree, 1, tex->nodetree);
-			write_nodetree_nolib(wd, tex->nodetree);
-		}
-
-		write_previews(wd, tex->preview);
-	}
+  if (tex->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_TE, Tex, 1, tex);
+    write_iddata(wd, &tex->id);
+
+    if (tex->adt) {
+      write_animdata(wd, tex->adt);
+    }
+
+    /* direct data */
+    if (tex->coba) {
+      writestruct(wd, DATA, ColorBand, 1, tex->coba);
+    }
+
+    /* nodetree is integral part of texture, no libdata */
+    if (tex->nodetree) {
+      writestruct(wd, DATA, bNodeTree, 1, tex->nodetree);
+      write_nodetree_nolib(wd, tex->nodetree);
+    }
+
+    write_previews(wd, tex->preview);
+  }
 }
 
 static void write_material(WriteData *wd, Material *ma)
 {
-	if (ma->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_MA, Material, 1, ma);
-		write_iddata(wd, &ma->id);
-
-		if (ma->adt) {
-			write_animdata(wd, ma->adt);
-		}
-
-		/* nodetree is integral part of material, no libdata */
-		if (ma->nodetree) {
-			writestruct(wd, DATA, bNodeTree, 1, ma->nodetree);
-			write_nodetree_nolib(wd, ma->nodetree);
-		}
-
-		write_previews(wd, ma->preview);
-
-		/* grease pencil settings */
-		if (ma->gp_style) {
-			writestruct(wd, DATA, MaterialGPencilStyle, 1, ma->gp_style);
-		}
-	}
+  if (ma->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_MA, Material, 1, ma);
+    write_iddata(wd, &ma->id);
+
+    if (ma->adt) {
+      write_animdata(wd, ma->adt);
+    }
+
+    /* nodetree is integral part of material, no libdata */
+    if (ma->nodetree) {
+      writestruct(wd, DATA, bNodeTree, 1, ma->nodetree);
+      write_nodetree_nolib(wd, ma->nodetree);
+    }
+
+    write_previews(wd, ma->preview);
+
+    /* grease pencil settings */
+    if (ma->gp_style) {
+      writestruct(wd, DATA, MaterialGPencilStyle, 1, ma->gp_style);
+    }
+  }
 }
 
 static void write_world(WriteData *wd, World *wrld)
 {
-	if (wrld->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_WO, World, 1, wrld);
-		write_iddata(wd, &wrld->id);
-
-		if (wrld->adt) {
-			write_animdata(wd, wrld->adt);
-		}
-
-		/* nodetree is integral part of world, no libdata */
-		if (wrld->nodetree) {
-			writestruct(wd, DATA, bNodeTree, 1, wrld->nodetree);
-			write_nodetree_nolib(wd, wrld->nodetree);
-		}
-
-		write_previews(wd, wrld->preview);
-	}
+  if (wrld->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_WO, World, 1, wrld);
+    write_iddata(wd, &wrld->id);
+
+    if (wrld->adt) {
+      write_animdata(wd, wrld->adt);
+    }
+
+    /* nodetree is integral part of world, no libdata */
+    if (wrld->nodetree) {
+      writestruct(wd, DATA, bNodeTree, 1, wrld->nodetree);
+      write_nodetree_nolib(wd, wrld->nodetree);
+    }
+
+    write_previews(wd, wrld->preview);
+  }
 }
 
 static void write_light(WriteData *wd, Light *la)
 {
-	if (la->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_LA, Light, 1, la);
-		write_iddata(wd, &la->id);
-
-		if (la->adt) {
-			write_animdata(wd, la->adt);
-		}
-
-		if (la->curfalloff) {
-			write_curvemapping(wd, la->curfalloff);
-		}
-
-		/* Node-tree is integral part of lights, no libdata. */
-		if (la->nodetree) {
-			writestruct(wd, DATA, bNodeTree, 1, la->nodetree);
-			write_nodetree_nolib(wd, la->nodetree);
-		}
-
-		write_previews(wd, la->preview);
-	}
+  if (la->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_LA, Light, 1, la);
+    write_iddata(wd, &la->id);
+
+    if (la->adt) {
+      write_animdata(wd, la->adt);
+    }
+
+    if (la->curfalloff) {
+      write_curvemapping(wd, la->curfalloff);
+    }
+
+    /* Node-tree is integral part of lights, no libdata. */
+    if (la->nodetree) {
+      writestruct(wd, DATA, bNodeTree, 1, la->nodetree);
+      write_nodetree_nolib(wd, la->nodetree);
+    }
+
+    write_previews(wd, la->preview);
+  }
 }
 
 static void write_collection_nolib(WriteData *wd, Collection *collection)
 {
-	/* Shared function for collection datablocks and scene master collection. */
-	write_previews(wd, collection->preview);
+  /* Shared function for collection datablocks and scene master collection. */
+  write_previews(wd, collection->preview);
 
-	for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
-		writestruct(wd, DATA, CollectionObject, 1, cob);
-	}
+  for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
+    writestruct(wd, DATA, CollectionObject, 1, cob);
+  }
 
-	for (CollectionChild *child = collection->children.first; child; child = child->next) {
-		writestruct(wd, DATA, CollectionChild, 1, child);
-	}
+  for (CollectionChild *child = collection->children.first; child; child = child->next) {
+    writestruct(wd, DATA, CollectionChild, 1, child);
+  }
 }
 
 static void write_collection(WriteData *wd, Collection *collection)
 {
-	if (collection->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_GR, Collection, 1, collection);
-		write_iddata(wd, &collection->id);
+  if (collection->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_GR, Collection, 1, collection);
+    write_iddata(wd, &collection->id);
 
-		write_collection_nolib(wd, collection);
-	}
+    write_collection_nolib(wd, collection);
+  }
 }
 
 static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
 {
-	SequenceModifierData *smd;
+  SequenceModifierData *smd;
 
-	for (smd = modbase->first; smd; smd = smd->next) {
-		const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
+  for (smd = modbase->first; smd; smd = smd->next) {
+    const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
 
-		if (smti) {
-			writestruct_id(wd, DATA, smti->struct_name, 1, smd);
+    if (smti) {
+      writestruct_id(wd, DATA, smti->struct_name, 1, smd);
 
-			if (smd->type == seqModifierType_Curves) {
-				CurvesModifierData *cmd = (CurvesModifierData *)smd;
+      if (smd->type == seqModifierType_Curves) {
+        CurvesModifierData *cmd = (CurvesModifierData *)smd;
 
-				write_curvemapping(wd, &cmd->curve_mapping);
-			}
-			else if (smd->type == seqModifierType_HueCorrect) {
-				HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
+        write_curvemapping(wd, &cmd->curve_mapping);
+      }
+      else if (smd->type == seqModifierType_HueCorrect) {
+        HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
 
-				write_curvemapping(wd, &hcmd->curve_mapping);
-			}
-		}
-		else {
-			writestruct(wd, DATA, SequenceModifierData, 1, smd);
-		}
-	}
+        write_curvemapping(wd, &hcmd->curve_mapping);
+      }
+    }
+    else {
+      writestruct(wd, DATA, SequenceModifierData, 1, smd);
+    }
+  }
 }
 
 static void write_view_settings(WriteData *wd, ColorManagedViewSettings *view_settings)
 {
-	if (view_settings->curve_mapping) {
-		write_curvemapping(wd, view_settings->curve_mapping);
-	}
+  if (view_settings->curve_mapping) {
+    write_curvemapping(wd, view_settings->curve_mapping);
+  }
 }
 
 static void write_paint(WriteData *wd, Paint *p)
 {
-	if (p->cavity_curve) {
-		write_curvemapping(wd, p->cavity_curve);
-	}
-	writedata(wd, DATA, sizeof(PaintToolSlot) * p->tool_slots_len, p->tool_slots);
+  if (p->cavity_curve) {
+    write_curvemapping(wd, p->cavity_curve);
+  }
+  writedata(wd, DATA, sizeof(PaintToolSlot) * p->tool_slots_len, p->tool_slots);
 }
 
 static void write_layer_collections(WriteData *wd, ListBase *lb)
 {
-	for (LayerCollection *lc = lb->first; lc; lc = lc->next) {
-		writestruct(wd, DATA, LayerCollection, 1, lc);
+  for (LayerCollection *lc = lb->first; lc; lc = lc->next) {
+    writestruct(wd, DATA, LayerCollection, 1, lc);
 
-		write_layer_collections(wd, &lc->layer_collections);
-	}
+    write_layer_collections(wd, &lc->layer_collections);
+  }
 }
 
 static void write_view_layer(WriteData *wd, ViewLayer *view_layer)
 {
-	writestruct(wd, DATA, ViewLayer, 1, view_layer);
-	writelist(wd, DATA, Base, &view_layer->object_bases);
-
-	if (view_layer->id_properties) {
-		IDP_WriteProperty(view_layer->id_properties, wd);
-	}
-
-	for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) {
-		writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc);
-	}
-
-	for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) {
-		writestruct(wd, DATA, FreestyleLineSet, 1, fls);
-	}
-	write_layer_collections(wd, &view_layer->layer_collections);
+  writestruct(wd, DATA, ViewLayer, 1, view_layer);
+  writelist(wd, DATA, Base, &view_layer->object_bases);
+
+  if (view_layer->id_properties) {
+    IDP_WriteProperty(view_layer->id_properties, wd);
+  }
+
+  for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc;
+       fmc = fmc->next) {
+    writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc);
+  }
+
+  for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) {
+    writestruct(wd, DATA, FreestyleLineSet, 1, fls);
+  }
+  write_layer_collections(wd, &view_layer->layer_collections);
 }
 
 static void write_lightcache_texture(WriteData *wd, LightCacheTexture *tex)
 {
-	if (tex->data) {
-		size_t data_size = tex->components * tex->tex_size[0] * tex->tex_size[1] * tex->tex_size[2];
-		if (tex->data_type == LIGHTCACHETEX_FLOAT) {
-			data_size *= sizeof(float);
-		}
-		else if (tex->data_type == LIGHTCACHETEX_UINT) {
-			data_size *= sizeof(uint);
-		}
-		writedata(wd, DATA, data_size, tex->data);
-	}
+  if (tex->data) {
+    size_t data_size = tex->components * tex->tex_size[0] * tex->tex_size[1] * tex->tex_size[2];
+    if (tex->data_type == LIGHTCACHETEX_FLOAT) {
+      data_size *= sizeof(float);
+    }
+    else if (tex->data_type == LIGHTCACHETEX_UINT) {
+      data_size *= sizeof(uint);
+    }
+    writedata(wd, DATA, data_size, tex->data);
+  }
 }
 
 static void write_lightcache(WriteData *wd, LightCache *cache)
 {
-	write_lightcache_texture(wd, &cache->grid_tx);
-	write_lightcache_texture(wd, &cache->cube_tx);
-
-	if (cache->cube_mips) {
-		writestruct(wd, DATA, LightCacheTexture, cache->mips_len, cache->cube_mips);
-		for (int i = 0; i < cache->mips_len; ++i) {
-			write_lightcache_texture(wd, &cache->cube_mips[i]);
-		}
-	}
-
-	writestruct(wd, DATA, LightGridCache,    cache->grid_len, cache->grid_data);
-	writestruct(wd, DATA, LightProbeCache,   cache->cube_len, cache->cube_data);
+  write_lightcache_texture(wd, &cache->grid_tx);
+  write_lightcache_texture(wd, &cache->cube_tx);
+
+  if (cache->cube_mips) {
+    writestruct(wd, DATA, LightCacheTexture, cache->mips_len, cache->cube_mips);
+    for (int i = 0; i < cache->mips_len; ++i) {
+      write_lightcache_texture(wd, &cache->cube_mips[i]);
+    }
+  }
+
+  writestruct(wd, DATA, LightGridCache, cache->grid_len, cache->grid_data);
+  writestruct(wd, DATA, LightProbeCache, cache->cube_len, cache->cube_data);
 }
 
 static void write_scene(WriteData *wd, Scene *sce)
 {
-	/* write LibData */
-	writestruct(wd, ID_SCE, Scene, 1, sce);
-	write_iddata(wd, &sce->id);
-
-	if (sce->adt) {
-		write_animdata(wd, sce->adt);
-	}
-	write_keyingsets(wd, &sce->keyingsets);
-
-	/* direct data */
-	ToolSettings *tos = sce->toolsettings;
-	writestruct(wd, DATA, ToolSettings, 1, tos);
-	if (tos->vpaint) {
-		writestruct(wd, DATA, VPaint, 1, tos->vpaint);
-		write_paint(wd, &tos->vpaint->paint);
-	}
-	if (tos->wpaint) {
-		writestruct(wd, DATA, VPaint, 1, tos->wpaint);
-		write_paint(wd, &tos->wpaint->paint);
-	}
-	if (tos->sculpt) {
-		writestruct(wd, DATA, Sculpt, 1, tos->sculpt);
-		write_paint(wd, &tos->sculpt->paint);
-	}
-	if (tos->uvsculpt) {
-		writestruct(wd, DATA, UvSculpt, 1, tos->uvsculpt);
-		write_paint(wd, &tos->uvsculpt->paint);
-	}
-	if (tos->gp_paint) {
-		writestruct(wd, DATA, GpPaint, 1, tos->gp_paint);
-		write_paint(wd, &tos->gp_paint->paint);
-	}
-	/* write grease-pencil custom ipo curve to file */
-	if (tos->gp_interpolate.custom_ipo) {
-		write_curvemapping(wd, tos->gp_interpolate.custom_ipo);
-	}
-	/* write grease-pencil multiframe falloff curve to file */
-	if (tos->gp_sculpt.cur_falloff) {
-		write_curvemapping(wd, tos->gp_sculpt.cur_falloff);
-	}
-	/* write grease-pencil primitive curve to file */
-	if (tos->gp_sculpt.cur_primitive) {
-		write_curvemapping(wd, tos->gp_sculpt.cur_primitive);
-	}
-
-	write_paint(wd, &tos->imapaint.paint);
-
-	Editing *ed = sce->ed;
-	if (ed) {
-		Sequence *seq;
-
-		writestruct(wd, DATA, Editing, 1, ed);
-
-		/* reset write flags too */
-
-		SEQ_BEGIN(ed, seq)
-		{
-			if (seq->strip) {
-				seq->strip->done = false;
-			}
-			writestruct(wd, DATA, Sequence, 1, seq);
-		} SEQ_END;
-
-		SEQ_BEGIN(ed, seq)
-		{
-			if (seq->strip && seq->strip->done == 0) {
-				/* write strip with 'done' at 0 because readfile */
-
-				if (seq->effectdata) {
-					switch (seq->type) {
-						case SEQ_TYPE_COLOR:
-							writestruct(wd, DATA, SolidColorVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_SPEED:
-							writestruct(wd, DATA, SpeedControlVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_WIPE:
-							writestruct(wd, DATA, WipeVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_GLOW:
-							writestruct(wd, DATA, GlowVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_TRANSFORM:
-							writestruct(wd, DATA, TransformVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_GAUSSIAN_BLUR:
-							writestruct(wd, DATA, GaussianBlurVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_TEXT:
-							writestruct(wd, DATA, TextVars, 1, seq->effectdata);
-							break;
-						case SEQ_TYPE_COLORMIX:
-							writestruct(wd, DATA, ColorMixVars, 1, seq->effectdata);
-							break;
-					}
-				}
-
-				writestruct(wd, DATA, Stereo3dFormat, 1, seq->stereo3d_format);
-
-				Strip *strip = seq->strip;
-				writestruct(wd, DATA, Strip, 1, strip);
-				if (seq->flag & SEQ_USE_CROP && strip->crop) {
-					writestruct(wd, DATA, StripCrop, 1, strip->crop);
-				}
-				if (seq->flag & SEQ_USE_TRANSFORM && strip->transform) {
-					writestruct(wd, DATA, StripTransform, 1, strip->transform);
-				}
-				if (seq->flag & SEQ_USE_PROXY && strip->proxy) {
-					writestruct(wd, DATA, StripProxy, 1, strip->proxy);
-				}
-				if (seq->type == SEQ_TYPE_IMAGE) {
-					writestruct(wd, DATA, StripElem,
-					            MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem),
-					            strip->stripdata);
-				}
-				else if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD)) {
-					writestruct(wd, DATA, StripElem, 1, strip->stripdata);
-				}
-
-				strip->done = true;
-			}
-
-			if (seq->prop) {
-				IDP_WriteProperty(seq->prop, wd);
-			}
-
-			write_sequence_modifiers(wd, &seq->modifiers);
-		} SEQ_END;
-
-		/* new; meta stack too, even when its nasty restore code */
-		for (MetaStack *ms = ed->metastack.first; ms; ms = ms->next) {
-			writestruct(wd, DATA, MetaStack, 1, ms);
-		}
-	}
-
-	if (sce->r.avicodecdata) {
-		writestruct(wd, DATA, AviCodecData, 1, sce->r.avicodecdata);
-		if (sce->r.avicodecdata->lpFormat) {
-			writedata(wd, DATA, sce->r.avicodecdata->cbFormat, sce->r.avicodecdata->lpFormat);
-		}
-		if (sce->r.avicodecdata->lpParms) {
-			writedata(wd, DATA, sce->r.avicodecdata->cbParms, sce->r.avicodecdata->lpParms);
-		}
-	}
-	if (sce->r.ffcodecdata.properties) {
-		IDP_WriteProperty(sce->r.ffcodecdata.properties, wd);
-	}
-
-	/* writing dynamic list of TimeMarkers to the blend file */
-	for (TimeMarker *marker = sce->markers.first; marker; marker = marker->next) {
-		writestruct(wd, DATA, TimeMarker, 1, marker);
-	}
-
-	/* writing dynamic list of TransformOrientations to the blend file */
-	for (TransformOrientation *ts = sce->transform_spaces.first; ts; ts = ts->next) {
-		writestruct(wd, DATA, TransformOrientation, 1, ts);
-	}
-
-	/* writing MultiView to the blend file */
-	for (SceneRenderView *srv = sce->r.views.first; srv; srv = srv->next) {
-		writestruct(wd, DATA, SceneRenderView, 1, srv);
-	}
-
-	if (sce->nodetree) {
-		writestruct(wd, DATA, bNodeTree, 1, sce->nodetree);
-		write_nodetree_nolib(wd, sce->nodetree);
-	}
-
-	write_view_settings(wd, &sce->view_settings);
-
-	/* writing RigidBodyWorld data to the blend file */
-	if (sce->rigidbody_world) {
-		/* Set deprecated pointers to prevent crashes of older Blenders */
-		sce->rigidbody_world->pointcache = sce->rigidbody_world->shared->pointcache;
-		sce->rigidbody_world->ptcaches = sce->rigidbody_world->shared->ptcaches;
-		writestruct(wd, DATA, RigidBodyWorld, 1, sce->rigidbody_world);
-
-		writestruct(wd, DATA, RigidBodyWorld_Shared, 1, sce->rigidbody_world->shared);
-		writestruct(wd, DATA, EffectorWeights, 1, sce->rigidbody_world->effector_weights);
-		write_pointcaches(wd, &(sce->rigidbody_world->shared->ptcaches));
-	}
-
-	write_previews(wd, sce->preview);
-	write_curvemapping_curves(wd, &sce->r.mblur_shutter_curve);
-
-	for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
-		write_view_layer(wd, view_layer);
-	}
-
-	if (sce->master_collection) {
-		writestruct(wd, DATA, Collection, 1, sce->master_collection);
-		write_collection_nolib(wd, sce->master_collection);
-	}
-
-	/* Eevee Lightcache */
-	if (sce->eevee.light_cache && !wd->use_memfile) {
-		writestruct(wd, DATA, LightCache, 1, sce->eevee.light_cache);
-		write_lightcache(wd, sce->eevee.light_cache);
-	}
-
-	/* Freed on doversion. */
-	BLI_assert(sce->layer_properties == NULL);
+  /* write LibData */
+  writestruct(wd, ID_SCE, Scene, 1, sce);
+  write_iddata(wd, &sce->id);
+
+  if (sce->adt) {
+    write_animdata(wd, sce->adt);
+  }
+  write_keyingsets(wd, &sce->keyingsets);
+
+  /* direct data */
+  ToolSettings *tos = sce->toolsettings;
+  writestruct(wd, DATA, ToolSettings, 1, tos);
+  if (tos->vpaint) {
+    writestruct(wd, DATA, VPaint, 1, tos->vpaint);
+    write_paint(wd, &tos->vpaint->paint);
+  }
+  if (tos->wpaint) {
+    writestruct(wd, DATA, VPaint, 1, tos->wpaint);
+    write_paint(wd, &tos->wpaint->paint);
+  }
+  if (tos->sculpt) {
+    writestruct(wd, DATA, Sculpt, 1, tos->sculpt);
+    write_paint(wd, &tos->sculpt->paint);
+  }
+  if (tos->uvsculpt) {
+    writestruct(wd, DATA, UvSculpt, 1, tos->uvsculpt);
+    write_paint(wd, &tos->uvsculpt->paint);
+  }
+  if (tos->gp_paint) {
+    writestruct(wd, DATA, GpPaint, 1, tos->gp_paint);
+    write_paint(wd, &tos->gp_paint->paint);
+  }
+  /* write grease-pencil custom ipo curve to file */
+  if (tos->gp_interpolate.custom_ipo) {
+    write_curvemapping(wd, tos->gp_interpolate.custom_ipo);
+  }
+  /* write grease-pencil multiframe falloff curve to file */
+  if (tos->gp_sculpt.cur_falloff) {
+    write_curvemapping(wd, tos->gp_sculpt.cur_falloff);
+  }
+  /* write grease-pencil primitive curve to file */
+  if (tos->gp_sculpt.cur_primitive) {
+    write_curvemapping(wd, tos->gp_sculpt.cur_primitive);
+  }
+
+  write_paint(wd, &tos->imapaint.paint);
+
+  Editing *ed = sce->ed;
+  if (ed) {
+    Sequence *seq;
+
+    writestruct(wd, DATA, Editing, 1, ed);
+
+    /* reset write flags too */
+
+    SEQ_BEGIN (ed, seq) {
+      if (seq->strip) {
+        seq->strip->done = false;
+      }
+      writestruct(wd, DATA, Sequence, 1, seq);
+    }
+    SEQ_END;
+
+    SEQ_BEGIN (ed, seq) {
+      if (seq->strip && seq->strip->done == 0) {
+        /* write strip with 'done' at 0 because readfile */
+
+        if (seq->effectdata) {
+          switch (seq->type) {
+            case SEQ_TYPE_COLOR:
+              writestruct(wd, DATA, SolidColorVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_SPEED:
+              writestruct(wd, DATA, SpeedControlVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_WIPE:
+              writestruct(wd, DATA, WipeVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_GLOW:
+              writestruct(wd, DATA, GlowVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_TRANSFORM:
+              writestruct(wd, DATA, TransformVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_GAUSSIAN_BLUR:
+              writestruct(wd, DATA, GaussianBlurVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_TEXT:
+              writestruct(wd, DATA, TextVars, 1, seq->effectdata);
+              break;
+            case SEQ_TYPE_COLORMIX:
+              writestruct(wd, DATA, ColorMixVars, 1, seq->effectdata);
+              break;
+          }
+        }
+
+        writestruct(wd, DATA, Stereo3dFormat, 1, seq->stereo3d_format);
+
+        Strip *strip = seq->strip;
+        writestruct(wd, DATA, Strip, 1, strip);
+        if (seq->flag & SEQ_USE_CROP && strip->crop) {
+          writestruct(wd, DATA, StripCrop, 1, strip->crop);
+        }
+        if (seq->flag & SEQ_USE_TRANSFORM && strip->transform) {
+          writestruct(wd, DATA, StripTransform, 1, strip->transform);
+        }
+        if (seq->flag & SEQ_USE_PROXY && strip->proxy) {
+          writestruct(wd, DATA, StripProxy, 1, strip->proxy);
+        }
+        if (seq->type == SEQ_TYPE_IMAGE) {
+          writestruct(wd,
+                      DATA,
+                      StripElem,
+                      MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem),
+                      strip->stripdata);
+        }
+        else if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD)) {
+          writestruct(wd, DATA, StripElem, 1, strip->stripdata);
+        }
+
+        strip->done = true;
+      }
+
+      if (seq->prop) {
+        IDP_WriteProperty(seq->prop, wd);
+      }
+
+      write_sequence_modifiers(wd, &seq->modifiers);
+    }
+    SEQ_END;
+
+    /* new; meta stack too, even when its nasty restore code */
+    for (MetaStack *ms = ed->metastack.first; ms; ms = ms->next) {
+      writestruct(wd, DATA, MetaStack, 1, ms);
+    }
+  }
+
+  if (sce->r.avicodecdata) {
+    writestruct(wd, DATA, AviCodecData, 1, sce->r.avicodecdata);
+    if (sce->r.avicodecdata->lpFormat) {
+      writedata(wd, DATA, sce->r.avicodecdata->cbFormat, sce->r.avicodecdata->lpFormat);
+    }
+    if (sce->r.avicodecdata->lpParms) {
+      writedata(wd, DATA, sce->r.avicodecdata->cbParms, sce->r.avicodecdata->lpParms);
+    }
+  }
+  if (sce->r.ffcodecdata.properties) {
+    IDP_WriteProperty(sce->r.ffcodecdata.properties, wd);
+  }
+
+  /* writing dynamic list of TimeMarkers to the blend file */
+  for (TimeMarker *marker = sce->markers.first; marker; marker = marker->next) {
+    writestruct(wd, DATA, TimeMarker, 1, marker);
+  }
+
+  /* writing dynamic list of TransformOrientations to the blend file */
+  for (TransformOrientation *ts = sce->transform_spaces.first; ts; ts = ts->next) {
+    writestruct(wd, DATA, TransformOrientation, 1, ts);
+  }
+
+  /* writing MultiView to the blend file */
+  for (SceneRenderView *srv = sce->r.views.first; srv; srv = srv->next) {
+    writestruct(wd, DATA, SceneRenderView, 1, srv);
+  }
+
+  if (sce->nodetree) {
+    writestruct(wd, DATA, bNodeTree, 1, sce->nodetree);
+    write_nodetree_nolib(wd, sce->nodetree);
+  }
+
+  write_view_settings(wd, &sce->view_settings);
+
+  /* writing RigidBodyWorld data to the blend file */
+  if (sce->rigidbody_world) {
+    /* Set deprecated pointers to prevent crashes of older Blenders */
+    sce->rigidbody_world->pointcache = sce->rigidbody_world->shared->pointcache;
+    sce->rigidbody_world->ptcaches = sce->rigidbody_world->shared->ptcaches;
+    writestruct(wd, DATA, RigidBodyWorld, 1, sce->rigidbody_world);
+
+    writestruct(wd, DATA, RigidBodyWorld_Shared, 1, sce->rigidbody_world->shared);
+    writestruct(wd, DATA, EffectorWeights, 1, sce->rigidbody_world->effector_weights);
+    write_pointcaches(wd, &(sce->rigidbody_world->shared->ptcaches));
+  }
+
+  write_previews(wd, sce->preview);
+  write_curvemapping_curves(wd, &sce->r.mblur_shutter_curve);
+
+  for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+    write_view_layer(wd, view_layer);
+  }
+
+  if (sce->master_collection) {
+    writestruct(wd, DATA, Collection, 1, sce->master_collection);
+    write_collection_nolib(wd, sce->master_collection);
+  }
+
+  /* Eevee Lightcache */
+  if (sce->eevee.light_cache && !wd->use_memfile) {
+    writestruct(wd, DATA, LightCache, 1, sce->eevee.light_cache);
+    write_lightcache(wd, sce->eevee.light_cache);
+  }
+
+  /* Freed on doversion. */
+  BLI_assert(sce->layer_properties == NULL);
 }
 
 static void write_gpencil(WriteData *wd, bGPdata *gpd)
 {
-	if (gpd->id.us > 0 || wd->use_memfile) {
-		/* write gpd data block to file */
-		writestruct(wd, ID_GD, bGPdata, 1, gpd);
-		write_iddata(wd, &gpd->id);
-
-		if (gpd->adt) {
-			write_animdata(wd, gpd->adt);
-		}
-
-		writedata(wd, DATA, sizeof(void *) * gpd->totcol, gpd->mat);
-
-		/* write grease-pencil layers to file */
-		writelist(wd, DATA, bGPDlayer, &gpd->layers);
-		for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
-			/* write this layer's frames to file */
-			writelist(wd, DATA, bGPDframe, &gpl->frames);
-			for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
-				/* write strokes */
-				writelist(wd, DATA, bGPDstroke, &gpf->strokes);
-				for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
-					writestruct(wd, DATA, bGPDspoint, gps->totpoints, gps->points);
-					write_dverts(wd, gps->totpoints, gps->dvert);
-				}
-			}
-		}
-	}
+  if (gpd->id.us > 0 || wd->use_memfile) {
+    /* write gpd data block to file */
+    writestruct(wd, ID_GD, bGPdata, 1, gpd);
+    write_iddata(wd, &gpd->id);
+
+    if (gpd->adt) {
+      write_animdata(wd, gpd->adt);
+    }
+
+    writedata(wd, DATA, sizeof(void *) * gpd->totcol, gpd->mat);
+
+    /* write grease-pencil layers to file */
+    writelist(wd, DATA, bGPDlayer, &gpd->layers);
+    for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+      /* write this layer's frames to file */
+      writelist(wd, DATA, bGPDframe, &gpl->frames);
+      for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
+        /* write strokes */
+        writelist(wd, DATA, bGPDstroke, &gpf->strokes);
+        for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
+          writestruct(wd, DATA, bGPDspoint, gps->totpoints, gps->points);
+          write_dverts(wd, gps->totpoints, gps->dvert);
+        }
+      }
+    }
+  }
 }
 
 static void write_region(WriteData *wd, ARegion *ar, int spacetype)
 {
-	writestruct(wd, DATA, ARegion, 1, ar);
-
-	if (ar->regiondata) {
-		if (ar->flag & RGN_FLAG_TEMP_REGIONDATA) {
-			return;
-		}
-
-		switch (spacetype) {
-			case SPACE_VIEW3D:
-				if (ar->regiontype == RGN_TYPE_WINDOW) {
-					RegionView3D *rv3d = ar->regiondata;
-					writestruct(wd, DATA, RegionView3D, 1, rv3d);
-
-					if (rv3d->localvd) {
-						writestruct(wd, DATA, RegionView3D, 1, rv3d->localvd);
-					}
-					if (rv3d->clipbb) {
-						writestruct(wd, DATA, BoundBox, 1, rv3d->clipbb);
-					}
-
-				}
-				else
-					printf("regiondata write missing!\n");
-				break;
-			default:
-				printf("regiondata write missing!\n");
-		}
-	}
+  writestruct(wd, DATA, ARegion, 1, ar);
+
+  if (ar->regiondata) {
+    if (ar->flag & RGN_FLAG_TEMP_REGIONDATA) {
+      return;
+    }
+
+    switch (spacetype) {
+      case SPACE_VIEW3D:
+        if (ar->regiontype == RGN_TYPE_WINDOW) {
+          RegionView3D *rv3d = ar->regiondata;
+          writestruct(wd, DATA, RegionView3D, 1, rv3d);
+
+          if (rv3d->localvd) {
+            writestruct(wd, DATA, RegionView3D, 1, rv3d->localvd);
+          }
+          if (rv3d->clipbb) {
+            writestruct(wd, DATA, BoundBox, 1, rv3d->clipbb);
+          }
+        }
+        else
+          printf("regiondata write missing!\n");
+        break;
+      default:
+        printf("regiondata write missing!\n");
+    }
+  }
 }
 
 static void write_uilist(WriteData *wd, uiList *ui_list)
 {
-	writestruct(wd, DATA, uiList, 1, ui_list);
+  writestruct(wd, DATA, uiList, 1, ui_list);
 
-	if (ui_list->properties) {
-		IDP_WriteProperty(ui_list->properties, wd);
-	}
+  if (ui_list->properties) {
+    IDP_WriteProperty(ui_list->properties, wd);
+  }
 }
 
 static void write_soops(WriteData *wd, SpaceOutliner *so)
 {
-	BLI_mempool *ts = so->treestore;
-
-	if (ts) {
-		SpaceOutliner so_flat = *so;
-
-		int elems = BLI_mempool_len(ts);
-		/* linearize mempool to array */
-		TreeStoreElem *data = elems ? BLI_mempool_as_arrayN(ts, "TreeStoreElem") : NULL;
-
-		if (data) {
-			/* In this block we use the memory location of the treestore
-			 * but _not_ its data, the addresses in this case are UUID's,
-			 * since we can't rely on malloc giving us different values each time.
-			 */
-			TreeStore ts_flat = {0};
-
-			/* we know the treestore is at least as big as a pointer,
-			 * so offsetting works to give us a UUID. */
-			void *data_addr = (void *)POINTER_OFFSET(ts, sizeof(void *));
-
-			ts_flat.usedelem = elems;
-			ts_flat.totelem = elems;
-			ts_flat.data = data_addr;
-
-			writestruct(wd, DATA, SpaceOutliner, 1, so);
-
-			writestruct_at_address(wd, DATA, TreeStore, 1, ts, &ts_flat);
-			writestruct_at_address(wd, DATA, TreeStoreElem, elems, data_addr, data);
-
-			MEM_freeN(data);
-		}
-		else {
-			so_flat.treestore = NULL;
-			writestruct_at_address(wd, DATA, SpaceOutliner, 1, so, &so_flat);
-		}
-	}
-	else {
-		writestruct(wd, DATA, SpaceOutliner, 1, so);
-	}
+  BLI_mempool *ts = so->treestore;
+
+  if (ts) {
+    SpaceOutliner so_flat = *so;
+
+    int elems = BLI_mempool_len(ts);
+    /* linearize mempool to array */
+    TreeStoreElem *data = elems ? BLI_mempool_as_arrayN(ts, "TreeStoreElem") : NULL;
+
+    if (data) {
+      /* In this block we use the memory location of the treestore
+       * but _not_ its data, the addresses in this case are UUID's,
+       * since we can't rely on malloc giving us different values each time.
+       */
+      TreeStore ts_flat = {0};
+
+      /* we know the treestore is at least as big as a pointer,
+       * so offsetting works to give us a UUID. */
+      void *data_addr = (void *)POINTER_OFFSET(ts, sizeof(void *));
+
+      ts_flat.usedelem = elems;
+      ts_flat.totelem = elems;
+      ts_flat.data = data_addr;
+
+      writestruct(wd, DATA, SpaceOutliner, 1, so);
+
+      writestruct_at_address(wd, DATA, TreeStore, 1, ts, &ts_flat);
+      writestruct_at_address(wd, DATA, TreeStoreElem, elems, data_addr, data);
+
+      MEM_freeN(data);
+    }
+    else {
+      so_flat.treestore = NULL;
+      writestruct_at_address(wd, DATA, SpaceOutliner, 1, so, &so_flat);
+    }
+  }
+  else {
+    writestruct(wd, DATA, SpaceOutliner, 1, so);
+  }
 }
 
 static void write_panel_list(WriteData *wd, ListBase *lb)
 {
-	for (Panel *pa = lb->first; pa; pa = pa->next) {
-		writestruct(wd, DATA, Panel, 1, pa);
-		write_panel_list(wd, &pa->children);
-	}
+  for (Panel *pa = lb->first; pa; pa = pa->next) {
+    writestruct(wd, DATA, Panel, 1, pa);
+    write_panel_list(wd, &pa->children);
+  }
 }
 
 static void write_area_regions(WriteData *wd, ScrArea *area)
 {
-	for (ARegion *region = area->regionbase.first; region; region = region->next) {
-		write_region(wd, region, area->spacetype);
-		write_panel_list(wd, &region->panels);
-
-		for (PanelCategoryStack *pc_act = region->panels_category_active.first; pc_act; pc_act = pc_act->next) {
-			writestruct(wd, DATA, PanelCategoryStack, 1, pc_act);
-		}
-
-		for (uiList *ui_list = region->ui_lists.first; ui_list; ui_list = ui_list->next) {
-			write_uilist(wd, ui_list);
-		}
-
-		for (uiPreview *ui_preview = region->ui_previews.first; ui_preview; ui_preview = ui_preview->next) {
-			writestruct(wd, DATA, uiPreview, 1, ui_preview);
-		}
-	}
-
-	for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
-		for (ARegion *region = sl->regionbase.first; region; region = region->next) {
-			write_region(wd, region, sl->spacetype);
-		}
-
-		if (sl->spacetype == SPACE_VIEW3D) {
-			View3D *v3d = (View3D *)sl;
-			writestruct(wd, DATA, View3D, 1, v3d);
-
-			if (v3d->localvd) {
-				writestruct(wd, DATA, View3D, 1, v3d->localvd);
-			}
-
-			if (v3d->fx_settings.ssao) {
-				writestruct(wd, DATA, GPUSSAOSettings, 1, v3d->fx_settings.ssao);
-			}
-			if (v3d->fx_settings.dof) {
-				writestruct(wd, DATA, GPUDOFSettings, 1, v3d->fx_settings.dof);
-			}
-		}
-		else if (sl->spacetype == SPACE_GRAPH) {
-			SpaceGraph *sipo = (SpaceGraph *)sl;
-			ListBase tmpGhosts = sipo->runtime.ghost_curves;
-
-			/* temporarily disable ghost curves when saving */
-			BLI_listbase_clear(&sipo->runtime.ghost_curves);
-
-			writestruct(wd, DATA, SpaceGraph, 1, sl);
-			if (sipo->ads) {
-				writestruct(wd, DATA, bDopeSheet, 1, sipo->ads);
-			}
-
-			/* reenable ghost curves */
-			sipo->runtime.ghost_curves = tmpGhosts;
-		}
-		else if (sl->spacetype == SPACE_PROPERTIES) {
-			writestruct(wd, DATA, SpaceProperties, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_FILE) {
-			SpaceFile *sfile = (SpaceFile *)sl;
-
-			writestruct(wd, DATA, SpaceFile, 1, sl);
-			if (sfile->params) {
-				writestruct(wd, DATA, FileSelectParams, 1, sfile->params);
-			}
-		}
-		else if (sl->spacetype == SPACE_SEQ) {
-			writestruct(wd, DATA, SpaceSeq, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_OUTLINER) {
-			SpaceOutliner *so = (SpaceOutliner *)sl;
-			write_soops(wd, so);
-		}
-		else if (sl->spacetype == SPACE_IMAGE) {
-			writestruct(wd, DATA, SpaceImage, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_TEXT) {
-			writestruct(wd, DATA, SpaceText, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_SCRIPT) {
-			SpaceScript *scr = (SpaceScript *)sl;
-			scr->but_refs = NULL;
-			writestruct(wd, DATA, SpaceScript, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_ACTION) {
-			writestruct(wd, DATA, SpaceAction, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_NLA) {
-			SpaceNla *snla = (SpaceNla *)sl;
-
-			writestruct(wd, DATA, SpaceNla, 1, snla);
-			if (snla->ads) {
-				writestruct(wd, DATA, bDopeSheet, 1, snla->ads);
-			}
-		}
-		else if (sl->spacetype == SPACE_NODE) {
-			SpaceNode *snode = (SpaceNode *)sl;
-			bNodeTreePath *path;
-			writestruct(wd, DATA, SpaceNode, 1, snode);
-
-			for (path = snode->treepath.first; path; path = path->next) {
-				writestruct(wd, DATA, bNodeTreePath, 1, path);
-			}
-		}
-		else if (sl->spacetype == SPACE_CONSOLE) {
-			SpaceConsole *con = (SpaceConsole *)sl;
-			ConsoleLine *cl;
-
-			for (cl = con->history.first; cl; cl = cl->next) {
-				/* 'len_alloc' is invalid on write, set from 'len' on read */
-				writestruct(wd, DATA, ConsoleLine, 1, cl);
-				writedata(wd, DATA, cl->len + 1, cl->line);
-			}
-			writestruct(wd, DATA, SpaceConsole, 1, sl);
-		}
+  for (ARegion *region = area->regionbase.first; region; region = region->next) {
+    write_region(wd, region, area->spacetype);
+    write_panel_list(wd, &region->panels);
+
+    for (PanelCategoryStack *pc_act = region->panels_category_active.first; pc_act;
+         pc_act = pc_act->next) {
+      writestruct(wd, DATA, PanelCategoryStack, 1, pc_act);
+    }
+
+    for (uiList *ui_list = region->ui_lists.first; ui_list; ui_list = ui_list->next) {
+      write_uilist(wd, ui_list);
+    }
+
+    for (uiPreview *ui_preview = region->ui_previews.first; ui_preview;
+         ui_preview = ui_preview->next) {
+      writestruct(wd, DATA, uiPreview, 1, ui_preview);
+    }
+  }
+
+  for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
+    for (ARegion *region = sl->regionbase.first; region; region = region->next) {
+      write_region(wd, region, sl->spacetype);
+    }
+
+    if (sl->spacetype == SPACE_VIEW3D) {
+      View3D *v3d = (View3D *)sl;
+      writestruct(wd, DATA, View3D, 1, v3d);
+
+      if (v3d->localvd) {
+        writestruct(wd, DATA, View3D, 1, v3d->localvd);
+      }
+
+      if (v3d->fx_settings.ssao) {
+        writestruct(wd, DATA, GPUSSAOSettings, 1, v3d->fx_settings.ssao);
+      }
+      if (v3d->fx_settings.dof) {
+        writestruct(wd, DATA, GPUDOFSettings, 1, v3d->fx_settings.dof);
+      }
+    }
+    else if (sl->spacetype == SPACE_GRAPH) {
+      SpaceGraph *sipo = (SpaceGraph *)sl;
+      ListBase tmpGhosts = sipo->runtime.ghost_curves;
+
+      /* temporarily disable ghost curves when saving */
+      BLI_listbase_clear(&sipo->runtime.ghost_curves);
+
+      writestruct(wd, DATA, SpaceGraph, 1, sl);
+      if (sipo->ads) {
+        writestruct(wd, DATA, bDopeSheet, 1, sipo->ads);
+      }
+
+      /* reenable ghost curves */
+      sipo->runtime.ghost_curves = tmpGhosts;
+    }
+    else if (sl->spacetype == SPACE_PROPERTIES) {
+      writestruct(wd, DATA, SpaceProperties, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_FILE) {
+      SpaceFile *sfile = (SpaceFile *)sl;
+
+      writestruct(wd, DATA, SpaceFile, 1, sl);
+      if (sfile->params) {
+        writestruct(wd, DATA, FileSelectParams, 1, sfile->params);
+      }
+    }
+    else if (sl->spacetype == SPACE_SEQ) {
+      writestruct(wd, DATA, SpaceSeq, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_OUTLINER) {
+      SpaceOutliner *so = (SpaceOutliner *)sl;
+      write_soops(wd, so);
+    }
+    else if (sl->spacetype == SPACE_IMAGE) {
+      writestruct(wd, DATA, SpaceImage, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_TEXT) {
+      writestruct(wd, DATA, SpaceText, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_SCRIPT) {
+      SpaceScript *scr = (SpaceScript *)sl;
+      scr->but_refs = NULL;
+      writestruct(wd, DATA, SpaceScript, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_ACTION) {
+      writestruct(wd, DATA, SpaceAction, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_NLA) {
+      SpaceNla *snla = (SpaceNla *)sl;
+
+      writestruct(wd, DATA, SpaceNla, 1, snla);
+      if (snla->ads) {
+        writestruct(wd, DATA, bDopeSheet, 1, snla->ads);
+      }
+    }
+    else if (sl->spacetype == SPACE_NODE) {
+      SpaceNode *snode = (SpaceNode *)sl;
+      bNodeTreePath *path;
+      writestruct(wd, DATA, SpaceNode, 1, snode);
+
+      for (path = snode->treepath.first; path; path = path->next) {
+        writestruct(wd, DATA, bNodeTreePath, 1, path);
+      }
+    }
+    else if (sl->spacetype == SPACE_CONSOLE) {
+      SpaceConsole *con = (SpaceConsole *)sl;
+      ConsoleLine *cl;
+
+      for (cl = con->history.first; cl; cl = cl->next) {
+        /* 'len_alloc' is invalid on write, set from 'len' on read */
+        writestruct(wd, DATA, ConsoleLine, 1, cl);
+        writedata(wd, DATA, cl->len + 1, cl->line);
+      }
+      writestruct(wd, DATA, SpaceConsole, 1, sl);
+    }
 #ifdef WITH_GLOBAL_AREA_WRITING
-		else if (sl->spacetype == SPACE_TOPBAR) {
-			writestruct(wd, DATA, SpaceTopBar, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_STATUSBAR) {
-			writestruct(wd, DATA, SpaceStatusBar, 1, sl);
-		}
+    else if (sl->spacetype == SPACE_TOPBAR) {
+      writestruct(wd, DATA, SpaceTopBar, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_STATUSBAR) {
+      writestruct(wd, DATA, SpaceStatusBar, 1, sl);
+    }
 #endif
-		else if (sl->spacetype == SPACE_USERPREF) {
-			writestruct(wd, DATA, SpaceUserPref, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_CLIP) {
-			writestruct(wd, DATA, SpaceClip, 1, sl);
-		}
-		else if (sl->spacetype == SPACE_INFO) {
-			writestruct(wd, DATA, SpaceInfo, 1, sl);
-		}
-	}
+    else if (sl->spacetype == SPACE_USERPREF) {
+      writestruct(wd, DATA, SpaceUserPref, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_CLIP) {
+      writestruct(wd, DATA, SpaceClip, 1, sl);
+    }
+    else if (sl->spacetype == SPACE_INFO) {
+      writestruct(wd, DATA, SpaceInfo, 1, sl);
+    }
+  }
 }
 
 static void write_area_map(WriteData *wd, ScrAreaMap *area_map)
 {
-	writelist(wd, DATA, ScrVert, &area_map->vertbase);
-	writelist(wd, DATA, ScrEdge, &area_map->edgebase);
-	for (ScrArea *area = area_map->areabase.first; area; area = area->next) {
-		area->butspacetype = area->spacetype; /* Just for compatibility, will be reset below. */
+  writelist(wd, DATA, ScrVert, &area_map->vertbase);
+  writelist(wd, DATA, ScrEdge, &area_map->edgebase);
+  for (ScrArea *area = area_map->areabase.first; area; area = area->next) {
+    area->butspacetype = area->spacetype; /* Just for compatibility, will be reset below. */
 
-		writestruct(wd, DATA, ScrArea, 1, area);
+    writestruct(wd, DATA, ScrArea, 1, area);
 
 #ifdef WITH_GLOBAL_AREA_WRITING
-		writestruct(wd, DATA, ScrGlobalAreaData, 1, area->global);
+    writestruct(wd, DATA, ScrGlobalAreaData, 1, area->global);
 #endif
 
-		write_area_regions(wd, area);
+    write_area_regions(wd, area);
 
-		area->butspacetype = SPACE_EMPTY; /* Unset again, was changed above. */
-	}
+    area->butspacetype = SPACE_EMPTY; /* Unset again, was changed above. */
+  }
 }
 
 static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
 {
-	writestruct(wd, ID_WM, wmWindowManager, 1, wm);
-	write_iddata(wd, &wm->id);
+  writestruct(wd, ID_WM, wmWindowManager, 1, wm);
+  write_iddata(wd, &wm->id);
 
-	for (wmWindow *win = wm->windows.first; win; win = win->next) {
+  for (wmWindow *win = wm->windows.first; win; win = win->next) {
 #ifndef WITH_GLOBAL_AREA_WRITING
-		/* Don't write global areas yet, while we make changes to them. */
-		ScrAreaMap global_areas = win->global_areas;
-		memset(&win->global_areas, 0, sizeof(win->global_areas));
+    /* Don't write global areas yet, while we make changes to them. */
+    ScrAreaMap global_areas = win->global_areas;
+    memset(&win->global_areas, 0, sizeof(win->global_areas));
 #endif
 
-		/* update deprecated screen member (for so loading in 2.7x uses the correct screen) */
-		win->screen = BKE_workspace_active_screen_get(win->workspace_hook);
+    /* update deprecated screen member (for so loading in 2.7x uses the correct screen) */
+    win->screen = BKE_workspace_active_screen_get(win->workspace_hook);
 
-		writestruct(wd, DATA, wmWindow, 1, win);
-		writestruct(wd, DATA, WorkSpaceInstanceHook, 1, win->workspace_hook);
-		writestruct(wd, DATA, Stereo3dFormat, 1, win->stereo3d_format);
+    writestruct(wd, DATA, wmWindow, 1, win);
+    writestruct(wd, DATA, WorkSpaceInstanceHook, 1, win->workspace_hook);
+    writestruct(wd, DATA, Stereo3dFormat, 1, win->stereo3d_format);
 
 #ifdef WITH_GLOBAL_AREA_WRITING
-		write_area_map(wd, &win->global_areas);
+    write_area_map(wd, &win->global_areas);
 #else
-		win->global_areas = global_areas;
+    win->global_areas = global_areas;
 #endif
 
-		/* data is written, clear deprecated data again */
-		win->screen = NULL;
-	}
+    /* data is written, clear deprecated data again */
+    win->screen = NULL;
+  }
 }
 
 static void write_screen(WriteData *wd, bScreen *sc)
 {
-	/* Screens are reference counted, only saved if used by a workspace. */
-	if (sc->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		/* in 2.50+ files, the file identifier for screens is patched, forward compatibility */
-		writestruct(wd, ID_SCRN, bScreen, 1, sc);
-		write_iddata(wd, &sc->id);
-
-		write_previews(wd, sc->preview);
-
-		/* direct data */
-		write_area_map(wd, AREAMAP_FROM_SCREEN(sc));
-	}
+  /* Screens are reference counted, only saved if used by a workspace. */
+  if (sc->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    /* in 2.50+ files, the file identifier for screens is patched, forward compatibility */
+    writestruct(wd, ID_SCRN, bScreen, 1, sc);
+    write_iddata(wd, &sc->id);
+
+    write_previews(wd, sc->preview);
+
+    /* direct data */
+    write_area_map(wd, AREAMAP_FROM_SCREEN(sc));
+  }
 }
 
 static void write_bone(WriteData *wd, Bone *bone)
 {
-	/* PATCH for upward compatibility after 2.37+ armature recode */
-	bone->size[0] = bone->size[1] = bone->size[2] = 1.0f;
-
-	/* Write this bone */
-	writestruct(wd, DATA, Bone, 1, bone);
-
-	/* Write ID Properties -- and copy this comment EXACTLY for easy finding
-	 * of library blocks that implement this.*/
-	if (bone->prop) {
-		IDP_WriteProperty(bone->prop, wd);
-	}
-
-	/* Write Children */
-	for (Bone *cbone = bone->childbase.first; cbone; cbone = cbone->next) {
-		write_bone(wd, cbone);
-	}
+  /* PATCH for upward compatibility after 2.37+ armature recode */
+  bone->size[0] = bone->size[1] = bone->size[2] = 1.0f;
+
+  /* Write this bone */
+  writestruct(wd, DATA, Bone, 1, bone);
+
+  /* Write ID Properties -- and copy this comment EXACTLY for easy finding
+   * of library blocks that implement this.*/
+  if (bone->prop) {
+    IDP_WriteProperty(bone->prop, wd);
+  }
+
+  /* Write Children */
+  for (Bone *cbone = bone->childbase.first; cbone; cbone = cbone->next) {
+    write_bone(wd, cbone);
+  }
 }
 
 static void write_armature(WriteData *wd, bArmature *arm)
 {
-	if (arm->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_AR, bArmature, 1, arm);
-		write_iddata(wd, &arm->id);
-
-		if (arm->adt) {
-			write_animdata(wd, arm->adt);
-		}
-
-		/* Direct data */
-		for (Bone *bone = arm->bonebase.first; bone; bone = bone->next) {
-			write_bone(wd, bone);
-		}
-	}
+  if (arm->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_AR, bArmature, 1, arm);
+    write_iddata(wd, &arm->id);
+
+    if (arm->adt) {
+      write_animdata(wd, arm->adt);
+    }
+
+    /* Direct data */
+    for (Bone *bone = arm->bonebase.first; bone; bone = bone->next) {
+      write_bone(wd, bone);
+    }
+  }
 }
 
 static void write_text(WriteData *wd, Text *text)
 {
-	if ((text->flags & TXT_ISMEM) && (text->flags & TXT_ISEXT)) {
-		text->flags &= ~TXT_ISEXT;
-	}
-
-	/* write LibData */
-	writestruct(wd, ID_TXT, Text, 1, text);
-	write_iddata(wd, &text->id);
-
-	if (text->name) {
-		writedata(wd, DATA, strlen(text->name) + 1, text->name);
-	}
-
-	if (!(text->flags & TXT_ISEXT)) {
-		/* now write the text data, in two steps for optimization in the readfunction */
-		for (TextLine *tmp = text->lines.first; tmp; tmp = tmp->next) {
-			writestruct(wd, DATA, TextLine, 1, tmp);
-		}
-
-		for (TextLine *tmp = text->lines.first; tmp; tmp = tmp->next) {
-			writedata(wd, DATA, tmp->len + 1, tmp->line);
-		}
-	}
+  if ((text->flags & TXT_ISMEM) && (text->flags & TXT_ISEXT)) {
+    text->flags &= ~TXT_ISEXT;
+  }
+
+  /* write LibData */
+  writestruct(wd, ID_TXT, Text, 1, text);
+  write_iddata(wd, &text->id);
+
+  if (text->name) {
+    writedata(wd, DATA, strlen(text->name) + 1, text->name);
+  }
+
+  if (!(text->flags & TXT_ISEXT)) {
+    /* now write the text data, in two steps for optimization in the readfunction */
+    for (TextLine *tmp = text->lines.first; tmp; tmp = tmp->next) {
+      writestruct(wd, DATA, TextLine, 1, tmp);
+    }
+
+    for (TextLine *tmp = text->lines.first; tmp; tmp = tmp->next) {
+      writedata(wd, DATA, tmp->len + 1, tmp->line);
+    }
+  }
 }
 
 static void write_speaker(WriteData *wd, Speaker *spk)
 {
-	if (spk->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_SPK, Speaker, 1, spk);
-		write_iddata(wd, &spk->id);
-
-		if (spk->adt) {
-			write_animdata(wd, spk->adt);
-		}
-	}
+  if (spk->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_SPK, Speaker, 1, spk);
+    write_iddata(wd, &spk->id);
+
+    if (spk->adt) {
+      write_animdata(wd, spk->adt);
+    }
+  }
 }
 
 static void write_sound(WriteData *wd, bSound *sound)
 {
-	if (sound->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_SO, bSound, 1, sound);
-		write_iddata(wd, &sound->id);
-
-		if (sound->packedfile) {
-			PackedFile *pf = sound->packedfile;
-			writestruct(wd, DATA, PackedFile, 1, pf);
-			writedata(wd, DATA, pf->size, pf->data);
-		}
-	}
+  if (sound->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_SO, bSound, 1, sound);
+    write_iddata(wd, &sound->id);
+
+    if (sound->packedfile) {
+      PackedFile *pf = sound->packedfile;
+      writestruct(wd, DATA, PackedFile, 1, pf);
+      writedata(wd, DATA, pf->size, pf->data);
+    }
+  }
 }
 
 static void write_probe(WriteData *wd, LightProbe *prb)
 {
-	if (prb->id.us > 0 || wd->use_memfile) {
-		/* write LibData */
-		writestruct(wd, ID_LP, LightProbe, 1, prb);
-		write_iddata(wd, &prb->id);
-
-		if (prb->adt) {
-			write_animdata(wd, prb->adt);
-		}
-	}
+  if (prb->id.us > 0 || wd->use_memfile) {
+    /* write LibData */
+    writestruct(wd, ID_LP, LightProbe, 1, prb);
+    write_iddata(wd, &prb->id);
+
+    if (prb->adt) {
+      write_animdata(wd, prb->adt);
+    }
+  }
 }
 
 static void write_nodetree(WriteData *wd, bNodeTree *ntree)
 {
-	if (ntree->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_NT, bNodeTree, 1, ntree);
-		/* Note that trees directly used by other IDs (materials etc.) are not 'real' ID, they cannot
-		 * be linked, etc., so we write actual id data here only, for 'real' ID trees. */
-		write_iddata(wd, &ntree->id);
-
-		write_nodetree_nolib(wd, ntree);
-	}
+  if (ntree->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_NT, bNodeTree, 1, ntree);
+    /* Note that trees directly used by other IDs (materials etc.) are not 'real' ID, they cannot
+     * be linked, etc., so we write actual id data here only, for 'real' ID trees. */
+    write_iddata(wd, &ntree->id);
+
+    write_nodetree_nolib(wd, ntree);
+  }
 }
 
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
 static void customnodes_add_deprecated_data(Main *mainvar)
 {
-	FOREACH_NODETREE_BEGIN(mainvar, ntree, id) {
-		bNodeLink *link, *last_link = ntree->links.last;
-
-		/* only do this for node groups */
-		if (id != &ntree->id) {
-			continue;
-		}
-
-		/* Forward compatibility for group nodes: add links to node tree interface sockets.
-		 * These links are invalid by new rules (missing node pointer)!
-		 * They will be removed again in customnodes_free_deprecated_data,
-		 * cannot do this directly lest bNodeLink pointer mapping becomes ambiguous.
-		 * When loading files with such links in a new Blender version
-		 * they will be removed as well.
-		 */
-		for (link = ntree->links.first; link; link = link->next) {
-			bNode *fromnode = link->fromnode, *tonode = link->tonode;
-			bNodeSocket *fromsock = link->fromsock, *tosock = link->tosock;
-
-			/* check both sides of the link, to handle direct input-to-output links */
-			if (fromnode->type == NODE_GROUP_INPUT) {
-				fromnode = NULL;
-				fromsock = ntreeFindSocketInterface(ntree, SOCK_IN, fromsock->identifier);
-			}
-			/* only the active output node defines links */
-			if (tonode->type == NODE_GROUP_OUTPUT && (tonode->flag & NODE_DO_OUTPUT)) {
-				tonode = NULL;
-				tosock = ntreeFindSocketInterface(ntree, SOCK_OUT, tosock->identifier);
-			}
-
-			if (!fromnode || !tonode) {
-				/* Note: not using nodeAddLink here, it asserts existing node pointers */
-				bNodeLink *tlink = MEM_callocN(sizeof(bNodeLink), "group node link");
-				tlink->fromnode = fromnode;
-				tlink->fromsock = fromsock;
-				tlink->tonode = tonode;
-				tlink->tosock = tosock;
-				tosock->link = tlink;
-				tlink->flag |= NODE_LINK_VALID;
-				BLI_addtail(&ntree->links, tlink);
-			}
-
-			/* don't check newly created compatibility links */
-			if (link == last_link) {
-				break;
-			}
-		}
-	} FOREACH_NODETREE_END;
+  FOREACH_NODETREE_BEGIN (mainvar, ntree, id) {
+    bNodeLink *link, *last_link = ntree->links.last;
+
+    /* only do this for node groups */
+    if (id != &ntree->id) {
+      continue;
+    }
+
+    /* Forward compatibility for group nodes: add links to node tree interface sockets.
+     * These links are invalid by new rules (missing node pointer)!
+     * They will be removed again in customnodes_free_deprecated_data,
+     * cannot do this directly lest bNodeLink pointer mapping becomes ambiguous.
+     * When loading files with such links in a new Blender version
+     * they will be removed as well.
+     */
+    for (link = ntree->links.first; link; link = link->next) {
+      bNode *fromnode = link->fromnode, *tonode = link->tonode;
+      bNodeSocket *fromsock = link->fromsock, *tosock = link->tosock;
+
+      /* check both sides of the link, to handle direct input-to-output links */
+      if (fromnode->type == NODE_GROUP_INPUT) {
+        fromnode = NULL;
+        fromsock = ntreeFindSocketInterface(ntree, SOCK_IN, fromsock->identifier);
+      }
+      /* only the active output node defines links */
+      if (tonode->type == NODE_GROUP_OUTPUT && (tonode->flag & NODE_DO_OUTPUT)) {
+        tonode = NULL;
+        tosock = ntreeFindSocketInterface(ntree, SOCK_OUT, tosock->identifier);
+      }
+
+      if (!fromnode || !tonode) {
+        /* Note: not using nodeAddLink here, it asserts existing node pointers */
+        bNodeLink *tlink = MEM_callocN(sizeof(bNodeLink), "group node link");
+        tlink->fromnode = fromnode;
+        tlink->fromsock = fromsock;
+        tlink->tonode = tonode;
+        tlink->tosock = tosock;
+        tosock->link = tlink;
+        tlink->flag |= NODE_LINK_VALID;
+        BLI_addtail(&ntree->links, tlink);
+      }
+
+      /* don't check newly created compatibility links */
+      if (link == last_link) {
+        break;
+      }
+    }
+  }
+  FOREACH_NODETREE_END;
 }
 
 static void customnodes_free_deprecated_data(Main *mainvar)
 {
-	FOREACH_NODETREE_BEGIN(mainvar, ntree, id) {
-		bNodeLink *link, *next_link;
-
-		for (link = ntree->links.first; link; link = next_link) {
-			next_link = link->next;
-			if (link->fromnode == NULL || link->tonode == NULL) {
-				nodeRemLink(ntree, link);
-			}
-		}
-	} FOREACH_NODETREE_END;
+  FOREACH_NODETREE_BEGIN (mainvar, ntree, id) {
+    bNodeLink *link, *next_link;
+
+    for (link = ntree->links.first; link; link = next_link) {
+      next_link = link->next;
+      if (link->fromnode == NULL || link->tonode == NULL) {
+        nodeRemLink(ntree, link);
+      }
+    }
+  }
+  FOREACH_NODETREE_END;
 }
 #endif
 
 static void write_brush(WriteData *wd, Brush *brush)
 {
-	if (brush->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_BR, Brush, 1, brush);
-		write_iddata(wd, &brush->id);
-
-		if (brush->curve) {
-			write_curvemapping(wd, brush->curve);
-		}
-
-		if (brush->gpencil_settings) {
-			writestruct(wd, DATA, BrushGpencilSettings, 1, brush->gpencil_settings);
-
-			if (brush->gpencil_settings->curve_sensitivity) {
-				write_curvemapping(wd, brush->gpencil_settings->curve_sensitivity);
-			}
-			if (brush->gpencil_settings->curve_strength) {
-				write_curvemapping(wd, brush->gpencil_settings->curve_strength);
-			}
-			if (brush->gpencil_settings->curve_jitter) {
-				write_curvemapping(wd, brush->gpencil_settings->curve_jitter);
-			}
-		}
-		if (brush->gradient) {
-			writestruct(wd, DATA, ColorBand, 1, brush->gradient);
-		}
-	}
+  if (brush->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_BR, Brush, 1, brush);
+    write_iddata(wd, &brush->id);
+
+    if (brush->curve) {
+      write_curvemapping(wd, brush->curve);
+    }
+
+    if (brush->gpencil_settings) {
+      writestruct(wd, DATA, BrushGpencilSettings, 1, brush->gpencil_settings);
+
+      if (brush->gpencil_settings->curve_sensitivity) {
+        write_curvemapping(wd, brush->gpencil_settings->curve_sensitivity);
+      }
+      if (brush->gpencil_settings->curve_strength) {
+        write_curvemapping(wd, brush->gpencil_settings->curve_strength);
+      }
+      if (brush->gpencil_settings->curve_jitter) {
+        write_curvemapping(wd, brush->gpencil_settings->curve_jitter);
+      }
+    }
+    if (brush->gradient) {
+      writestruct(wd, DATA, ColorBand, 1, brush->gradient);
+    }
+  }
 }
 
 static void write_palette(WriteData *wd, Palette *palette)
 {
-	if (palette->id.us > 0 || wd->use_memfile) {
-		PaletteColor *color;
-		writestruct(wd, ID_PAL, Palette, 1, palette);
-		write_iddata(wd, &palette->id);
-
-		for (color = palette->colors.first; color; color = color->next) {
-			writestruct(wd, DATA, PaletteColor, 1, color);
-		}
-	}
+  if (palette->id.us > 0 || wd->use_memfile) {
+    PaletteColor *color;
+    writestruct(wd, ID_PAL, Palette, 1, palette);
+    write_iddata(wd, &palette->id);
+
+    for (color = palette->colors.first; color; color = color->next) {
+      writestruct(wd, DATA, PaletteColor, 1, color);
+    }
+  }
 }
 
 static void write_paintcurve(WriteData *wd, PaintCurve *pc)
 {
-	if (pc->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_PC, PaintCurve, 1, pc);
-		write_iddata(wd, &pc->id);
+  if (pc->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_PC, PaintCurve, 1, pc);
+    write_iddata(wd, &pc->id);
 
-		writestruct(wd, DATA, PaintCurvePoint, pc->tot_points, pc->points);
-	}
+    writestruct(wd, DATA, PaintCurvePoint, pc->tot_points, pc->points);
+  }
 }
 
 static void write_movieTracks(WriteData *wd, ListBase *tracks)
 {
-	MovieTrackingTrack *track;
+  MovieTrackingTrack *track;
 
-	track = tracks->first;
-	while (track) {
-		writestruct(wd, DATA, MovieTrackingTrack, 1, track);
+  track = tracks->first;
+  while (track) {
+    writestruct(wd, DATA, MovieTrackingTrack, 1, track);
 
-		if (track->markers) {
-			writestruct(wd, DATA, MovieTrackingMarker, track->markersnr, track->markers);
-		}
+    if (track->markers) {
+      writestruct(wd, DATA, MovieTrackingMarker, track->markersnr, track->markers);
+    }
 
-		track = track->next;
-	}
+    track = track->next;
+  }
 }
 
 static void write_moviePlaneTracks(WriteData *wd, ListBase *plane_tracks_base)
 {
-	MovieTrackingPlaneTrack *plane_track;
+  MovieTrackingPlaneTrack *plane_track;
 
-	for (plane_track = plane_tracks_base->first;
-	     plane_track;
-	     plane_track = plane_track->next)
-	{
-		writestruct(wd, DATA, MovieTrackingPlaneTrack, 1, plane_track);
+  for (plane_track = plane_tracks_base->first; plane_track; plane_track = plane_track->next) {
+    writestruct(wd, DATA, MovieTrackingPlaneTrack, 1, plane_track);
 
-		writedata(wd, DATA, sizeof(MovieTrackingTrack *) * plane_track->point_tracksnr, plane_track->point_tracks);
-		writestruct(wd, DATA, MovieTrackingPlaneMarker, plane_track->markersnr, plane_track->markers);
-	}
+    writedata(wd,
+              DATA,
+              sizeof(MovieTrackingTrack *) * plane_track->point_tracksnr,
+              plane_track->point_tracks);
+    writestruct(wd, DATA, MovieTrackingPlaneMarker, plane_track->markersnr, plane_track->markers);
+  }
 }
 
 static void write_movieReconstruction(WriteData *wd, MovieTrackingReconstruction *reconstruction)
 {
-	if (reconstruction->camnr) {
-		writestruct(wd, DATA, MovieReconstructedCamera, reconstruction->camnr, reconstruction->cameras);
-	}
+  if (reconstruction->camnr) {
+    writestruct(
+        wd, DATA, MovieReconstructedCamera, reconstruction->camnr, reconstruction->cameras);
+  }
 }
 
 static void write_movieclip(WriteData *wd, MovieClip *clip)
 {
-	if (clip->id.us > 0 || wd->use_memfile) {
-		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *object;
+  if (clip->id.us > 0 || wd->use_memfile) {
+    MovieTracking *tracking = &clip->tracking;
+    MovieTrackingObject *object;
 
-		writestruct(wd, ID_MC, MovieClip, 1, clip);
-		write_iddata(wd, &clip->id);
+    writestruct(wd, ID_MC, MovieClip, 1, clip);
+    write_iddata(wd, &clip->id);
 
-		if (clip->adt) {
-			write_animdata(wd, clip->adt);
-		}
+    if (clip->adt) {
+      write_animdata(wd, clip->adt);
+    }
 
-		write_movieTracks(wd, &tracking->tracks);
-		write_moviePlaneTracks(wd, &tracking->plane_tracks);
-		write_movieReconstruction(wd, &tracking->reconstruction);
+    write_movieTracks(wd, &tracking->tracks);
+    write_moviePlaneTracks(wd, &tracking->plane_tracks);
+    write_movieReconstruction(wd, &tracking->reconstruction);
 
-		object = tracking->objects.first;
-		while (object) {
-			writestruct(wd, DATA, MovieTrackingObject, 1, object);
+    object = tracking->objects.first;
+    while (object) {
+      writestruct(wd, DATA, MovieTrackingObject, 1, object);
 
-			write_movieTracks(wd, &object->tracks);
-			write_moviePlaneTracks(wd, &object->plane_tracks);
-			write_movieReconstruction(wd, &object->reconstruction);
+      write_movieTracks(wd, &object->tracks);
+      write_moviePlaneTracks(wd, &object->plane_tracks);
+      write_movieReconstruction(wd, &object->reconstruction);
 
-			object = object->next;
-		}
-	}
+      object = object->next;
+    }
+  }
 }
 
 static void write_mask(WriteData *wd, Mask *mask)
 {
-	if (mask->id.us > 0 || wd->use_memfile) {
-		MaskLayer *masklay;
+  if (mask->id.us > 0 || wd->use_memfile) {
+    MaskLayer *masklay;
 
-		writestruct(wd, ID_MSK, Mask, 1, mask);
-		write_iddata(wd, &mask->id);
+    writestruct(wd, ID_MSK, Mask, 1, mask);
+    write_iddata(wd, &mask->id);
 
-		if (mask->adt) {
-			write_animdata(wd, mask->adt);
-		}
+    if (mask->adt) {
+      write_animdata(wd, mask->adt);
+    }
 
-		for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
-			MaskSpline *spline;
-			MaskLayerShape *masklay_shape;
+    for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+      MaskSpline *spline;
+      MaskLayerShape *masklay_shape;
 
-			writestruct(wd, DATA, MaskLayer, 1, masklay);
+      writestruct(wd, DATA, MaskLayer, 1, masklay);
 
-			for (spline = masklay->splines.first; spline; spline = spline->next) {
-				int i;
+      for (spline = masklay->splines.first; spline; spline = spline->next) {
+        int i;
 
-				void *points_deform = spline->points_deform;
-				spline->points_deform = NULL;
+        void *points_deform = spline->points_deform;
+        spline->points_deform = NULL;
 
-				writestruct(wd, DATA, MaskSpline, 1, spline);
-				writestruct(wd, DATA, MaskSplinePoint, spline->tot_point, spline->points);
+        writestruct(wd, DATA, MaskSpline, 1, spline);
+        writestruct(wd, DATA, MaskSplinePoint, spline->tot_point, spline->points);
 
-				spline->points_deform = points_deform;
+        spline->points_deform = points_deform;
 
-				for (i = 0; i < spline->tot_point; i++) {
-					MaskSplinePoint *point = &spline->points[i];
+        for (i = 0; i < spline->tot_point; i++) {
+          MaskSplinePoint *point = &spline->points[i];
 
-					if (point->tot_uw) {
-						writestruct(wd, DATA, MaskSplinePointUW, point->tot_uw, point->uw);
-					}
-				}
-			}
+          if (point->tot_uw) {
+            writestruct(wd, DATA, MaskSplinePointUW, point->tot_uw, point->uw);
+          }
+        }
+      }
 
-			for (masklay_shape = masklay->splines_shapes.first;
-			     masklay_shape;
-			     masklay_shape = masklay_shape->next)
-			{
-				writestruct(wd, DATA, MaskLayerShape, 1, masklay_shape);
-				writedata(wd, DATA,
-				          masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE,
-				          masklay_shape->data);
-			}
-		}
-	}
+      for (masklay_shape = masklay->splines_shapes.first; masklay_shape;
+           masklay_shape = masklay_shape->next) {
+        writestruct(wd, DATA, MaskLayerShape, 1, masklay_shape);
+        writedata(wd,
+                  DATA,
+                  masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE,
+                  masklay_shape->data);
+      }
+    }
+  }
 }
 
 static void write_linestyle_color_modifiers(WriteData *wd, ListBase *modifiers)
 {
-	LineStyleModifier *m;
-
-	for (m = modifiers->first; m; m = m->next) {
-		int struct_nr;
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_AlongStroke);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromCamera);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromObject);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Material);
-				break;
-			case LS_MODIFIER_TANGENT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Tangent);
-				break;
-			case LS_MODIFIER_NOISE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Noise);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_CreaseAngle);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Curvature_3D);
-				break;
-			default:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
-		}
-		writestruct_nr(wd, DATA, struct_nr, 1, m);
-	}
-	for (m = modifiers->first; m; m = m->next) {
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Material *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_TANGENT:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Tangent *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_NOISE:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Noise *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
-				break;
-		}
-	}
+  LineStyleModifier *m;
+
+  for (m = modifiers->first; m; m = m->next) {
+    int struct_nr;
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_AlongStroke);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromCamera);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromObject);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Material);
+        break;
+      case LS_MODIFIER_TANGENT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Tangent);
+        break;
+      case LS_MODIFIER_NOISE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Noise);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_CreaseAngle);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Curvature_3D);
+        break;
+      default:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
+    }
+    writestruct_nr(wd, DATA, struct_nr, 1, m);
+  }
+  for (m = modifiers->first; m; m = m->next) {
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        writestruct(
+            wd, DATA, ColorBand, 1, ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        writestruct(
+            wd, DATA, ColorBand, 1, ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Material *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_TANGENT:
+        writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Tangent *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_NOISE:
+        writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Noise *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        writestruct(wd, DATA, ColorBand, 1, ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        writestruct(
+            wd, DATA, ColorBand, 1, ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
+        break;
+    }
+  }
 }
 
 static void write_linestyle_alpha_modifiers(WriteData *wd, ListBase *modifiers)
 {
-	LineStyleModifier *m;
-
-	for (m = modifiers->first; m; m = m->next) {
-		int struct_nr;
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_AlongStroke);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromCamera);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromObject);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Material);
-				break;
-			case LS_MODIFIER_TANGENT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Tangent);
-				break;
-			case LS_MODIFIER_NOISE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Noise);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_CreaseAngle);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Curvature_3D);
-				break;
-			default:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier);  /* this should not happen */
-		}
-		writestruct_nr(wd, DATA, struct_nr, 1, m);
-	}
-	for (m = modifiers->first; m; m = m->next) {
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_Material *)m)->curve);
-				break;
-			case LS_MODIFIER_TANGENT:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_Tangent *)m)->curve);
-				break;
-			case LS_MODIFIER_NOISE:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_Noise *)m)->curve);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				write_curvemapping(wd, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
-				break;
-		}
-	}
+  LineStyleModifier *m;
+
+  for (m = modifiers->first; m; m = m->next) {
+    int struct_nr;
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_AlongStroke);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromCamera);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromObject);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Material);
+        break;
+      case LS_MODIFIER_TANGENT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Tangent);
+        break;
+      case LS_MODIFIER_NOISE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Noise);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_CreaseAngle);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Curvature_3D);
+        break;
+      default:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
+    }
+    writestruct_nr(wd, DATA, struct_nr, 1, m);
+  }
+  for (m = modifiers->first; m; m = m->next) {
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_Material *)m)->curve);
+        break;
+      case LS_MODIFIER_TANGENT:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_Tangent *)m)->curve);
+        break;
+      case LS_MODIFIER_NOISE:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_Noise *)m)->curve);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        write_curvemapping(wd, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
+        break;
+    }
+  }
 }
 
 static void write_linestyle_thickness_modifiers(WriteData *wd, ListBase *modifiers)
 {
-	LineStyleModifier *m;
-
-	for (m = modifiers->first; m; m = m->next) {
-		int struct_nr;
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_AlongStroke);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromCamera);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromObject);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Material);
-				break;
-			case LS_MODIFIER_CALLIGRAPHY:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Calligraphy);
-				break;
-			case LS_MODIFIER_TANGENT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Tangent);
-				break;
-			case LS_MODIFIER_NOISE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Noise);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_CreaseAngle);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Curvature_3D);
-				break;
-			default:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier);  /* this should not happen */
-		}
-		writestruct_nr(wd, DATA, struct_nr, 1, m);
-	}
-	for (m = modifiers->first; m; m = m->next) {
-		switch (m->type) {
-			case LS_MODIFIER_ALONG_STROKE:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_AlongStroke *)m)->curve);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_CAMERA:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
-				break;
-			case LS_MODIFIER_DISTANCE_FROM_OBJECT:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
-				break;
-			case LS_MODIFIER_MATERIAL:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_Material *)m)->curve);
-				break;
-			case LS_MODIFIER_TANGENT:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_Tangent *)m)->curve);
-				break;
-			case LS_MODIFIER_CREASE_ANGLE:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_CreaseAngle *)m)->curve);
-				break;
-			case LS_MODIFIER_CURVATURE_3D:
-				write_curvemapping(wd, ((LineStyleThicknessModifier_Curvature_3D *)m)->curve);
-				break;
-		}
-	}
+  LineStyleModifier *m;
+
+  for (m = modifiers->first; m; m = m->next) {
+    int struct_nr;
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_AlongStroke);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromCamera);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromObject);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Material);
+        break;
+      case LS_MODIFIER_CALLIGRAPHY:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Calligraphy);
+        break;
+      case LS_MODIFIER_TANGENT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Tangent);
+        break;
+      case LS_MODIFIER_NOISE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Noise);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_CreaseAngle);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Curvature_3D);
+        break;
+      default:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
+    }
+    writestruct_nr(wd, DATA, struct_nr, 1, m);
+  }
+  for (m = modifiers->first; m; m = m->next) {
+    switch (m->type) {
+      case LS_MODIFIER_ALONG_STROKE:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_AlongStroke *)m)->curve);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
+        break;
+      case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
+        break;
+      case LS_MODIFIER_MATERIAL:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_Material *)m)->curve);
+        break;
+      case LS_MODIFIER_TANGENT:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_Tangent *)m)->curve);
+        break;
+      case LS_MODIFIER_CREASE_ANGLE:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_CreaseAngle *)m)->curve);
+        break;
+      case LS_MODIFIER_CURVATURE_3D:
+        write_curvemapping(wd, ((LineStyleThicknessModifier_Curvature_3D *)m)->curve);
+        break;
+    }
+  }
 }
 
 static void write_linestyle_geometry_modifiers(WriteData *wd, ListBase *modifiers)
 {
-	LineStyleModifier *m;
-
-	for (m = modifiers->first; m; m = m->next) {
-		int struct_nr;
-		switch (m->type) {
-			case LS_MODIFIER_SAMPLING:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Sampling);
-				break;
-			case LS_MODIFIER_BEZIER_CURVE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BezierCurve);
-				break;
-			case LS_MODIFIER_SINUS_DISPLACEMENT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SinusDisplacement);
-				break;
-			case LS_MODIFIER_SPATIAL_NOISE:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SpatialNoise);
-				break;
-			case LS_MODIFIER_PERLIN_NOISE_1D:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise1D);
-				break;
-			case LS_MODIFIER_PERLIN_NOISE_2D:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise2D);
-				break;
-			case LS_MODIFIER_BACKBONE_STRETCHER:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BackboneStretcher);
-				break;
-			case LS_MODIFIER_TIP_REMOVER:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_TipRemover);
-				break;
-			case LS_MODIFIER_POLYGONIZATION:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Polygonalization);
-				break;
-			case LS_MODIFIER_GUIDING_LINES:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_GuidingLines);
-				break;
-			case LS_MODIFIER_BLUEPRINT:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Blueprint);
-				break;
-			case LS_MODIFIER_2D_OFFSET:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DOffset);
-				break;
-			case LS_MODIFIER_2D_TRANSFORM:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DTransform);
-				break;
-			case LS_MODIFIER_SIMPLIFICATION:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Simplification);
-				break;
-			default:
-				struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier);  /* this should not happen */
-		}
-		writestruct_nr(wd, DATA, struct_nr, 1, m);
-	}
+  LineStyleModifier *m;
+
+  for (m = modifiers->first; m; m = m->next) {
+    int struct_nr;
+    switch (m->type) {
+      case LS_MODIFIER_SAMPLING:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Sampling);
+        break;
+      case LS_MODIFIER_BEZIER_CURVE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BezierCurve);
+        break;
+      case LS_MODIFIER_SINUS_DISPLACEMENT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SinusDisplacement);
+        break;
+      case LS_MODIFIER_SPATIAL_NOISE:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SpatialNoise);
+        break;
+      case LS_MODIFIER_PERLIN_NOISE_1D:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise1D);
+        break;
+      case LS_MODIFIER_PERLIN_NOISE_2D:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise2D);
+        break;
+      case LS_MODIFIER_BACKBONE_STRETCHER:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BackboneStretcher);
+        break;
+      case LS_MODIFIER_TIP_REMOVER:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_TipRemover);
+        break;
+      case LS_MODIFIER_POLYGONIZATION:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Polygonalization);
+        break;
+      case LS_MODIFIER_GUIDING_LINES:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_GuidingLines);
+        break;
+      case LS_MODIFIER_BLUEPRINT:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Blueprint);
+        break;
+      case LS_MODIFIER_2D_OFFSET:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DOffset);
+        break;
+      case LS_MODIFIER_2D_TRANSFORM:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DTransform);
+        break;
+      case LS_MODIFIER_SIMPLIFICATION:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Simplification);
+        break;
+      default:
+        struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
+    }
+    writestruct_nr(wd, DATA, struct_nr, 1, m);
+  }
 }
 
 static void write_linestyle(WriteData *wd, FreestyleLineStyle *linestyle)
 {
-	if (linestyle->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_LS, FreestyleLineStyle, 1, linestyle);
-		write_iddata(wd, &linestyle->id);
-
-		if (linestyle->adt) {
-			write_animdata(wd, linestyle->adt);
-		}
-
-		write_linestyle_color_modifiers(wd, &linestyle->color_modifiers);
-		write_linestyle_alpha_modifiers(wd, &linestyle->alpha_modifiers);
-		write_linestyle_thickness_modifiers(wd, &linestyle->thickness_modifiers);
-		write_linestyle_geometry_modifiers(wd, &linestyle->geometry_modifiers);
-		for (int a = 0; a < MAX_MTEX; a++) {
-			if (linestyle->mtex[a]) {
-				writestruct(wd, DATA, MTex, 1, linestyle->mtex[a]);
-			}
-		}
-		if (linestyle->nodetree) {
-			writestruct(wd, DATA, bNodeTree, 1, linestyle->nodetree);
-			write_nodetree_nolib(wd, linestyle->nodetree);
-		}
-	}
+  if (linestyle->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_LS, FreestyleLineStyle, 1, linestyle);
+    write_iddata(wd, &linestyle->id);
+
+    if (linestyle->adt) {
+      write_animdata(wd, linestyle->adt);
+    }
+
+    write_linestyle_color_modifiers(wd, &linestyle->color_modifiers);
+    write_linestyle_alpha_modifiers(wd, &linestyle->alpha_modifiers);
+    write_linestyle_thickness_modifiers(wd, &linestyle->thickness_modifiers);
+    write_linestyle_geometry_modifiers(wd, &linestyle->geometry_modifiers);
+    for (int a = 0; a < MAX_MTEX; a++) {
+      if (linestyle->mtex[a]) {
+        writestruct(wd, DATA, MTex, 1, linestyle->mtex[a]);
+      }
+    }
+    if (linestyle->nodetree) {
+      writestruct(wd, DATA, bNodeTree, 1, linestyle->nodetree);
+      write_nodetree_nolib(wd, linestyle->nodetree);
+    }
+  }
 }
 
 static void write_cachefile(WriteData *wd, CacheFile *cache_file)
 {
-	if (cache_file->id.us > 0 || wd->use_memfile) {
-		writestruct(wd, ID_CF, CacheFile, 1, cache_file);
+  if (cache_file->id.us > 0 || wd->use_memfile) {
+    writestruct(wd, ID_CF, CacheFile, 1, cache_file);
 
-		if (cache_file->adt) {
-			write_animdata(wd, cache_file->adt);
-		}
-	}
+    if (cache_file->adt) {
+      write_animdata(wd, cache_file->adt);
+    }
+  }
 }
 
 static void write_workspace(WriteData *wd, WorkSpace *workspace)
 {
-	ListBase *layouts = BKE_workspace_layouts_get(workspace);
-
-	writestruct(wd, ID_WS, WorkSpace, 1, workspace);
-	writelist(wd, DATA, WorkSpaceLayout, layouts);
-	writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations);
-	writelist(wd, DATA, wmOwnerID, &workspace->owner_ids);
-	writelist(wd, DATA, bToolRef, &workspace->tools);
-	for (bToolRef *tref = workspace->tools.first; tref; tref = tref->next) {
-		if (tref->properties) {
-			IDP_WriteProperty(tref->properties, wd);
-		}
-	}
+  ListBase *layouts = BKE_workspace_layouts_get(workspace);
+
+  writestruct(wd, ID_WS, WorkSpace, 1, workspace);
+  writelist(wd, DATA, WorkSpaceLayout, layouts);
+  writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations);
+  writelist(wd, DATA, wmOwnerID, &workspace->owner_ids);
+  writelist(wd, DATA, bToolRef, &workspace->tools);
+  for (bToolRef *tref = workspace->tools.first; tref; tref = tref->next) {
+    if (tref->properties) {
+      IDP_WriteProperty(tref->properties, wd);
+    }
+  }
 }
 
 /* Keep it last of write_foodata functions. */
 static void write_libraries(WriteData *wd, Main *main)
 {
-	ListBase *lbarray[MAX_LIBARRAY];
-	ID *id;
-	int a, tot;
-	bool found_one;
-
-	for (; main; main = main->next) {
-		a = tot = set_listbasepointers(main, lbarray);
-
-		/* test: is lib being used */
-		if (main->curlib && main->curlib->packedfile) {
-			found_one = true;
-		}
-		else {
-			found_one = false;
-			while (!found_one && tot--) {
-				for (id = lbarray[tot]->first; id; id = id->next) {
-					if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
-						found_one = true;
-						break;
-					}
-				}
-			}
-		}
-
-		/* to be able to restore quit.blend and temp saves, the packed blend has to be in undo buffers... */
-		/* XXX needs rethink, just like save UI in undo files now - would be nice to append things only for the]
-		 * quit.blend and temp saves */
-		if (found_one) {
-			/* Not overridable. */
-
-			writestruct(wd, ID_LI, Library, 1, main->curlib);
-			write_iddata(wd, &main->curlib->id);
-
-			if (main->curlib->packedfile) {
-				PackedFile *pf = main->curlib->packedfile;
-				writestruct(wd, DATA, PackedFile, 1, pf);
-				writedata(wd, DATA, pf->size, pf->data);
-				if (wd->use_memfile == false) {
-					printf("write packed .blend: %s\n", main->curlib->name);
-				}
-			}
-
-			/* Write link placeholders for all direct linked IDs. */
-			while (a--) {
-				for (id = lbarray[a]->first; id; id = id->next) {
-					if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
-						if (!BKE_idcode_is_linkable(GS(id->name))) {
-							printf("ERROR: write file: data-block '%s' from lib '%s' is not linkable "
-							       "but is flagged as directly linked", id->name, main->curlib->filepath);
-							BLI_assert(0);
-						}
-						writestruct(wd, ID_LINK_PLACEHOLDER, ID, 1, id);
-					}
-				}
-			}
-		}
-	}
-
-	mywrite_flush(wd);
+  ListBase *lbarray[MAX_LIBARRAY];
+  ID *id;
+  int a, tot;
+  bool found_one;
+
+  for (; main; main = main->next) {
+    a = tot = set_listbasepointers(main, lbarray);
+
+    /* test: is lib being used */
+    if (main->curlib && main->curlib->packedfile) {
+      found_one = true;
+    }
+    else {
+      found_one = false;
+      while (!found_one && tot--) {
+        for (id = lbarray[tot]->first; id; id = id->next) {
+          if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
+            found_one = true;
+            break;
+          }
+        }
+      }
+    }
+
+    /* to be able to restore quit.blend and temp saves, the packed blend has to be in undo buffers... */
+    /* XXX needs rethink, just like save UI in undo files now - would be nice to append things only for the]
+     * quit.blend and temp saves */
+    if (found_one) {
+      /* Not overridable. */
+
+      writestruct(wd, ID_LI, Library, 1, main->curlib);
+      write_iddata(wd, &main->curlib->id);
+
+      if (main->curlib->packedfile) {
+        PackedFile *pf = main->curlib->packedfile;
+        writestruct(wd, DATA, PackedFile, 1, pf);
+        writedata(wd, DATA, pf->size, pf->data);
+        if (wd->use_memfile == false) {
+          printf("write packed .blend: %s\n", main->curlib->name);
+        }
+      }
+
+      /* Write link placeholders for all direct linked IDs. */
+      while (a--) {
+        for (id = lbarray[a]->first; id; id = id->next) {
+          if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
+            if (!BKE_idcode_is_linkable(GS(id->name))) {
+              printf(
+                  "ERROR: write file: data-block '%s' from lib '%s' is not linkable "
+                  "but is flagged as directly linked",
+                  id->name,
+                  main->curlib->filepath);
+              BLI_assert(0);
+            }
+            writestruct(wd, ID_LINK_PLACEHOLDER, ID, 1, id);
+          }
+        }
+      }
+    }
+  }
+
+  mywrite_flush(wd);
 }
 
 /* context is usually defined by WM, two cases where no WM is available:
@@ -3774,50 +3785,50 @@ static void write_libraries(WriteData *wd, Main *main)
  * - for undofile, curscene needs to be saved */
 static void write_global(WriteData *wd, int fileflags, Main *mainvar)
 {
-	const bool is_undo = wd->use_memfile;
-	FileGlobal fg;
-	bScreen *screen;
-	Scene *scene;
-	ViewLayer *view_layer;
-	char subvstr[8];
-
-	/* prevent mem checkers from complaining */
-	memset(fg._pad, 0, sizeof(fg._pad));
-	memset(fg.filename, 0, sizeof(fg.filename));
-	memset(fg.build_hash, 0, sizeof(fg.build_hash));
-	fg._pad1 = NULL;
-
-	current_screen_compat(mainvar, is_undo, &screen, &scene, &view_layer);
-
-	/* XXX still remap G */
-	fg.curscreen = screen;
-	fg.curscene = scene;
-	fg.cur_view_layer = view_layer;
-
-	/* prevent to save this, is not good convention, and feature with concerns... */
-	fg.fileflags = (fileflags & ~G_FILE_FLAG_ALL_RUNTIME);
-
-	fg.globalf = G.f;
-	BLI_strncpy(fg.filename, mainvar->name, sizeof(fg.filename));
-	sprintf(subvstr, "%4d", BLENDER_SUBVERSION);
-	memcpy(fg.subvstr, subvstr, 4);
-
-	fg.subversion = BLENDER_SUBVERSION;
-	fg.minversion = BLENDER_MINVERSION;
-	fg.minsubversion = BLENDER_MINSUBVERSION;
+  const bool is_undo = wd->use_memfile;
+  FileGlobal fg;
+  bScreen *screen;
+  Scene *scene;
+  ViewLayer *view_layer;
+  char subvstr[8];
+
+  /* prevent mem checkers from complaining */
+  memset(fg._pad, 0, sizeof(fg._pad));
+  memset(fg.filename, 0, sizeof(fg.filename));
+  memset(fg.build_hash, 0, sizeof(fg.build_hash));
+  fg._pad1 = NULL;
+
+  current_screen_compat(mainvar, is_undo, &screen, &scene, &view_layer);
+
+  /* XXX still remap G */
+  fg.curscreen = screen;
+  fg.curscene = scene;
+  fg.cur_view_layer = view_layer;
+
+  /* prevent to save this, is not good convention, and feature with concerns... */
+  fg.fileflags = (fileflags & ~G_FILE_FLAG_ALL_RUNTIME);
+
+  fg.globalf = G.f;
+  BLI_strncpy(fg.filename, mainvar->name, sizeof(fg.filename));
+  sprintf(subvstr, "%4d", BLENDER_SUBVERSION);
+  memcpy(fg.subvstr, subvstr, 4);
+
+  fg.subversion = BLENDER_SUBVERSION;
+  fg.minversion = BLENDER_MINVERSION;
+  fg.minsubversion = BLENDER_MINSUBVERSION;
 #ifdef WITH_BUILDINFO
-	{
-		extern unsigned long build_commit_timestamp;
-		extern char build_hash[];
-		/* TODO(sergey): Add branch name to file as well? */
-		fg.build_commit_timestamp = build_commit_timestamp;
-		BLI_strncpy(fg.build_hash, build_hash, sizeof(fg.build_hash));
-	}
+  {
+    extern unsigned long build_commit_timestamp;
+    extern char build_hash[];
+    /* TODO(sergey): Add branch name to file as well? */
+    fg.build_commit_timestamp = build_commit_timestamp;
+    BLI_strncpy(fg.build_hash, build_hash, sizeof(fg.build_hash));
+  }
 #else
-	fg.build_commit_timestamp = 0;
-	BLI_strncpy(fg.build_hash, "unknown", sizeof(fg.build_hash));
+  fg.build_commit_timestamp = 0;
+  BLI_strncpy(fg.build_hash, "unknown", sizeof(fg.build_hash));
 #endif
-	writestruct(wd, GLOB, FileGlobal, 1, &fg);
+  writestruct(wd, GLOB, FileGlobal, 1, &fg);
 }
 
 /* preview image, first 2 values are width and height
@@ -3826,9 +3837,9 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
  */
 static void write_thumb(WriteData *wd, const BlendThumbnail *thumb)
 {
-	if (thumb) {
-		writedata(wd, TEST, BLEN_THUMB_MEMSIZE_FILE(thumb->width, thumb->height), thumb);
-	}
+  if (thumb) {
+    writedata(wd, TEST, BLEN_THUMB_MEMSIZE_FILE(thumb->width, thumb->height), thumb);
+  }
 }
 
 /** \} */
@@ -3838,276 +3849,281 @@ static void write_thumb(WriteData *wd, const BlendThumbnail *thumb)
  * \{ */
 
 /* if MemFile * there's filesave to memory */
-static bool write_file_handle(
-        Main *mainvar,
-        WriteWrap *ww,
-        MemFile *compare, MemFile *current,
-        int write_flags, const BlendThumbnail *thumb)
+static bool write_file_handle(Main *mainvar,
+                              WriteWrap *ww,
+                              MemFile *compare,
+                              MemFile *current,
+                              int write_flags,
+                              const BlendThumbnail *thumb)
 {
-	BHead bhead;
-	ListBase mainlist;
-	char buf[16];
-	WriteData *wd;
+  BHead bhead;
+  ListBase mainlist;
+  char buf[16];
+  WriteData *wd;
 
-	blo_split_main(&mainlist, mainvar);
+  blo_split_main(&mainlist, mainvar);
 
-	wd = mywrite_begin(ww, compare, current);
+  wd = mywrite_begin(ww, compare, current);
 
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-	/* don't write compatibility data on undo */
-	if (!current) {
-		/* deprecated forward compat data is freed again below */
-		customnodes_add_deprecated_data(mainvar);
-	}
+  /* don't write compatibility data on undo */
+  if (!current) {
+    /* deprecated forward compat data is freed again below */
+    customnodes_add_deprecated_data(mainvar);
+  }
 #endif
 
-	sprintf(buf, "BLENDER%c%c%.3d",
-	        (sizeof(void *) == 8)      ? '-' : '_',
-	        (ENDIAN_ORDER == B_ENDIAN) ? 'V' : 'v',
-	        BLENDER_VERSION);
-
-	mywrite(wd, buf, 12);
-
-	write_renderinfo(wd, mainvar);
-	write_thumb(wd, thumb);
-	write_global(wd, write_flags, mainvar);
-
-	/* The windowmanager and screen often change,
-	 * avoid thumbnail detecting changes because of this. */
-	mywrite_flush(wd);
-
-	OverrideStaticStorage *override_storage = wd->use_memfile ? NULL : BKE_override_static_operations_store_initialize();
-
-	/* This outer loop allows to save first datablocks from real mainvar, then the temp ones from override process,
-	 * if needed, without duplicating whole code. */
-	Main *bmain = mainvar;
-	do {
-		ListBase *lbarray[MAX_LIBARRAY];
-		int a = set_listbasepointers(bmain, lbarray);
-		while (a--) {
-			ID *id = lbarray[a]->first;
-
-			if (id && GS(id->name) == ID_LI) {
-				continue;  /* Libraries are handled separately below. */
-			}
-
-			for (; id; id = id->next) {
-				/* We should never attempt to write non-regular IDs (i.e. all kind of temp/runtime ones). */
-				BLI_assert((id->tag & (LIB_TAG_NO_MAIN | LIB_TAG_NO_USER_REFCOUNT | LIB_TAG_NOT_ALLOCATED)) == 0);
-
-				const bool do_override = !ELEM(override_storage, NULL, bmain) && id->override_static;
-
-				if (do_override) {
-					BKE_override_static_operations_store_start(bmain, override_storage, id);
-				}
-
-				switch ((ID_Type)GS(id->name)) {
-					case ID_WM:
-						write_windowmanager(wd, (wmWindowManager *)id);
-						break;
-					case ID_WS:
-						write_workspace(wd, (WorkSpace *)id);
-						break;
-					case ID_SCR:
-						write_screen(wd, (bScreen *)id);
-						break;
-					case ID_MC:
-						write_movieclip(wd, (MovieClip *)id);
-						break;
-					case ID_MSK:
-						write_mask(wd, (Mask *)id);
-						break;
-					case ID_SCE:
-						write_scene(wd, (Scene *)id);
-						break;
-					case ID_CU:
-						write_curve(wd, (Curve *)id);
-						break;
-					case ID_MB:
-						write_mball(wd, (MetaBall *)id);
-						break;
-					case ID_IM:
-						write_image(wd, (Image *)id);
-						break;
-					case ID_CA:
-						write_camera(wd, (Camera *)id);
-						break;
-					case ID_LA:
-						write_light(wd, (Light *)id);
-						break;
-					case ID_LT:
-						write_lattice(wd, (Lattice *)id);
-						break;
-					case ID_VF:
-						write_vfont(wd, (VFont *)id);
-						break;
-					case ID_KE:
-						write_key(wd, (Key *)id);
-						break;
-					case ID_WO:
-						write_world(wd, (World *)id);
-						break;
-					case ID_TXT:
-						write_text(wd, (Text *)id);
-						break;
-					case ID_SPK:
-						write_speaker(wd, (Speaker *)id);
-						break;
-					case ID_LP:
-						write_probe(wd, (LightProbe *)id);
-						break;
-					case ID_SO:
-						write_sound(wd, (bSound *)id);
-						break;
-					case ID_GR:
-						write_collection(wd, (Collection *)id);
-						break;
-					case ID_AR:
-						write_armature(wd, (bArmature *)id);
-						break;
-					case ID_AC:
-						write_action(wd, (bAction *)id);
-						break;
-					case ID_OB:
-						write_object(wd, (Object *)id);
-						break;
-					case ID_MA:
-						write_material(wd, (Material *)id);
-						break;
-					case ID_TE:
-						write_texture(wd, (Tex *)id);
-						break;
-					case ID_ME:
-						write_mesh(wd, (Mesh *)id);
-						break;
-					case ID_PA:
-						write_particlesettings(wd, (ParticleSettings *)id);
-						break;
-					case ID_NT:
-						write_nodetree(wd, (bNodeTree *)id);
-						break;
-					case ID_BR:
-						write_brush(wd, (Brush *)id);
-						break;
-					case ID_PAL:
-						write_palette(wd, (Palette *)id);
-						break;
-					case ID_PC:
-						write_paintcurve(wd, (PaintCurve *)id);
-						break;
-					case ID_GD:
-						write_gpencil(wd, (bGPdata *)id);
-						break;
-					case ID_LS:
-						write_linestyle(wd, (FreestyleLineStyle *)id);
-						break;
-					case ID_CF:
-						write_cachefile(wd, (CacheFile *)id);
-						break;
-					case ID_LI:
-						/* Do nothing, handled below - and should never be reached. */
-						BLI_assert(0);
-						break;
-					case ID_IP:
-						/* Do nothing, deprecated. */
-						break;
-					default:
-						/* Should never be reached. */
-						BLI_assert(0);
-						break;
-				}
-
-				if (do_override) {
-					BKE_override_static_operations_store_end(override_storage, id);
-				}
-			}
-
-			mywrite_flush(wd);
-		}
-	} while ((bmain != override_storage) && (bmain = override_storage));
-
-	if (override_storage) {
-		BKE_override_static_operations_store_finalize(override_storage);
-		override_storage = NULL;
-	}
-
-	/* Special handling, operating over split Mains... */
-	write_libraries(wd,  mainvar->next);
-
-	/* So changes above don't cause a 'DNA1' to be detected as changed on undo. */
-	mywrite_flush(wd);
-
-	if (write_flags & G_FILE_USERPREFS) {
-		write_userdef(wd, &U);
-	}
-
-	/* Write DNA last, because (to be implemented) test for which structs are written.
-	 *
-	 * Note that we *borrow* the pointer to 'DNAstr',
-	 * so writing each time uses the same address and doesn't cause unnecessary undo overhead. */
-	writedata(wd, DNA1, wd->sdna->data_len, wd->sdna->data);
+  sprintf(buf,
+          "BLENDER%c%c%.3d",
+          (sizeof(void *) == 8) ? '-' : '_',
+          (ENDIAN_ORDER == B_ENDIAN) ? 'V' : 'v',
+          BLENDER_VERSION);
+
+  mywrite(wd, buf, 12);
+
+  write_renderinfo(wd, mainvar);
+  write_thumb(wd, thumb);
+  write_global(wd, write_flags, mainvar);
+
+  /* The windowmanager and screen often change,
+   * avoid thumbnail detecting changes because of this. */
+  mywrite_flush(wd);
+
+  OverrideStaticStorage *override_storage = wd->use_memfile ?
+                                                NULL :
+                                                BKE_override_static_operations_store_initialize();
+
+  /* This outer loop allows to save first datablocks from real mainvar, then the temp ones from override process,
+   * if needed, without duplicating whole code. */
+  Main *bmain = mainvar;
+  do {
+    ListBase *lbarray[MAX_LIBARRAY];
+    int a = set_listbasepointers(bmain, lbarray);
+    while (a--) {
+      ID *id = lbarray[a]->first;
+
+      if (id && GS(id->name) == ID_LI) {
+        continue; /* Libraries are handled separately below. */
+      }
+
+      for (; id; id = id->next) {
+        /* We should never attempt to write non-regular IDs (i.e. all kind of temp/runtime ones). */
+        BLI_assert(
+            (id->tag & (LIB_TAG_NO_MAIN | LIB_TAG_NO_USER_REFCOUNT | LIB_TAG_NOT_ALLOCATED)) == 0);
+
+        const bool do_override = !ELEM(override_storage, NULL, bmain) && id->override_static;
+
+        if (do_override) {
+          BKE_override_static_operations_store_start(bmain, override_storage, id);
+        }
+
+        switch ((ID_Type)GS(id->name)) {
+          case ID_WM:
+            write_windowmanager(wd, (wmWindowManager *)id);
+            break;
+          case ID_WS:
+            write_workspace(wd, (WorkSpace *)id);
+            break;
+          case ID_SCR:
+            write_screen(wd, (bScreen *)id);
+            break;
+          case ID_MC:
+            write_movieclip(wd, (MovieClip *)id);
+            break;
+          case ID_MSK:
+            write_mask(wd, (Mask *)id);
+            break;
+          case ID_SCE:
+            write_scene(wd, (Scene *)id);
+            break;
+          case ID_CU:
+            write_curve(wd, (Curve *)id);
+            break;
+          case ID_MB:
+            write_mball(wd, (MetaBall *)id);
+            break;
+          case ID_IM:
+            write_image(wd, (Image *)id);
+            break;
+          case ID_CA:
+            write_camera(wd, (Camera *)id);
+            break;
+          case ID_LA:
+            write_light(wd, (Light *)id);
+            break;
+          case ID_LT:
+            write_lattice(wd, (Lattice *)id);
+            break;
+          case ID_VF:
+            write_vfont(wd, (VFont *)id);
+            break;
+          case ID_KE:
+            write_key(wd, (Key *)id);
+            break;
+          case ID_WO:
+            write_world(wd, (World *)id);
+            break;
+          case ID_TXT:
+            write_text(wd, (Text *)id);
+            break;
+          case ID_SPK:
+            write_speaker(wd, (Speaker *)id);
+            break;
+          case ID_LP:
+            write_probe(wd, (LightProbe *)id);
+            break;
+          case ID_SO:
+            write_sound(wd, (bSound *)id);
+            break;
+          case ID_GR:
+            write_collection(wd, (Collection *)id);
+            break;
+          case ID_AR:
+            write_armature(wd, (bArmature *)id);
+            break;
+          case ID_AC:
+            write_action(wd, (bAction *)id);
+            break;
+          case ID_OB:
+            write_object(wd, (Object *)id);
+            break;
+          case ID_MA:
+            write_material(wd, (Material *)id);
+            break;
+          case ID_TE:
+            write_texture(wd, (Tex *)id);
+            break;
+          case ID_ME:
+            write_mesh(wd, (Mesh *)id);
+            break;
+          case ID_PA:
+            write_particlesettings(wd, (ParticleSettings *)id);
+            break;
+          case ID_NT:
+            write_nodetree(wd, (bNodeTree *)id);
+            break;
+          case ID_BR:
+            write_brush(wd, (Brush *)id);
+            break;
+          case ID_PAL:
+            write_palette(wd, (Palette *)id);
+            break;
+          case ID_PC:
+            write_paintcurve(wd, (PaintCurve *)id);
+            break;
+          case ID_GD:
+            write_gpencil(wd, (bGPdata *)id);
+            break;
+          case ID_LS:
+            write_linestyle(wd, (FreestyleLineStyle *)id);
+            break;
+          case ID_CF:
+            write_cachefile(wd, (CacheFile *)id);
+            break;
+          case ID_LI:
+            /* Do nothing, handled below - and should never be reached. */
+            BLI_assert(0);
+            break;
+          case ID_IP:
+            /* Do nothing, deprecated. */
+            break;
+          default:
+            /* Should never be reached. */
+            BLI_assert(0);
+            break;
+        }
+
+        if (do_override) {
+          BKE_override_static_operations_store_end(override_storage, id);
+        }
+      }
+
+      mywrite_flush(wd);
+    }
+  } while ((bmain != override_storage) && (bmain = override_storage));
+
+  if (override_storage) {
+    BKE_override_static_operations_store_finalize(override_storage);
+    override_storage = NULL;
+  }
+
+  /* Special handling, operating over split Mains... */
+  write_libraries(wd, mainvar->next);
+
+  /* So changes above don't cause a 'DNA1' to be detected as changed on undo. */
+  mywrite_flush(wd);
+
+  if (write_flags & G_FILE_USERPREFS) {
+    write_userdef(wd, &U);
+  }
+
+  /* Write DNA last, because (to be implemented) test for which structs are written.
+   *
+   * Note that we *borrow* the pointer to 'DNAstr',
+   * so writing each time uses the same address and doesn't cause unnecessary undo overhead. */
+  writedata(wd, DNA1, wd->sdna->data_len, wd->sdna->data);
 
 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-	/* compatibility data not created on undo */
-	if (!current) {
-		/* Ugly, forward compatibility code generates deprecated data during writing,
-		 * this has to be freed again. Can not be done directly after writing, otherwise
-		 * the data pointers could be reused and not be mapped correctly.
-		 */
-		customnodes_free_deprecated_data(mainvar);
-	}
+  /* compatibility data not created on undo */
+  if (!current) {
+    /* Ugly, forward compatibility code generates deprecated data during writing,
+     * this has to be freed again. Can not be done directly after writing, otherwise
+     * the data pointers could be reused and not be mapped correctly.
+     */
+    customnodes_free_deprecated_data(mainvar);
+  }
 #endif
 
-	/* end of file */
-	memset(&bhead, 0, sizeof(BHead));
-	bhead.code = ENDB;
-	mywrite(wd, &bhead, sizeof(BHead));
+  /* end of file */
+  memset(&bhead, 0, sizeof(BHead));
+  bhead.code = ENDB;
+  mywrite(wd, &bhead, sizeof(BHead));
 
-	blo_join_main(&mainlist);
+  blo_join_main(&mainlist);
 
-	return mywrite_end(wd);
+  return mywrite_end(wd);
 }
 
 /* do reverse file history: .blend1 -> .blend2, .blend -> .blend1 */
 /* return: success(0), failure(1) */
 static bool do_history(const char *name, ReportList *reports)
 {
-	char tempname1[FILE_MAX], tempname2[FILE_MAX];
-	int hisnr = U.versions;
-
-	if (U.versions == 0) {
-		return 0;
-	}
-
-	if (strlen(name) < 2) {
-		BKE_report(reports, RPT_ERROR, "Unable to make version backup: filename too short");
-		return 1;
-	}
-
-	while (hisnr > 1) {
-		BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr - 1);
-		if (BLI_exists(tempname1)) {
-			BLI_snprintf(tempname2, sizeof(tempname2), "%s%d", name, hisnr);
-
-			if (BLI_rename(tempname1, tempname2)) {
-				BKE_report(reports, RPT_ERROR, "Unable to make version backup");
-				return true;
-			}
-		}
-		hisnr--;
-	}
-
-	/* is needed when hisnr==1 */
-	if (BLI_exists(name)) {
-		BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr);
-
-		if (BLI_rename(name, tempname1)) {
-			BKE_report(reports, RPT_ERROR, "Unable to make version backup");
-			return true;
-		}
-	}
-
-	return 0;
+  char tempname1[FILE_MAX], tempname2[FILE_MAX];
+  int hisnr = U.versions;
+
+  if (U.versions == 0) {
+    return 0;
+  }
+
+  if (strlen(name) < 2) {
+    BKE_report(reports, RPT_ERROR, "Unable to make version backup: filename too short");
+    return 1;
+  }
+
+  while (hisnr > 1) {
+    BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr - 1);
+    if (BLI_exists(tempname1)) {
+      BLI_snprintf(tempname2, sizeof(tempname2), "%s%d", name, hisnr);
+
+      if (BLI_rename(tempname1, tempname2)) {
+        BKE_report(reports, RPT_ERROR, "Unable to make version backup");
+        return true;
+      }
+    }
+    hisnr--;
+  }
+
+  /* is needed when hisnr==1 */
+  if (BLI_exists(name)) {
+    BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr);
+
+    if (BLI_rename(name, tempname1)) {
+      BKE_report(reports, RPT_ERROR, "Unable to make version backup");
+      return true;
+    }
+  }
+
+  return 0;
 }
 
 /** \} */
@@ -4119,114 +4135,117 @@ static bool do_history(const char *name, ReportList *reports)
 /**
  * \return Success.
  */
-bool BLO_write_file(
-        Main *mainvar, const char *filepath, int write_flags,
-        ReportList *reports, const BlendThumbnail *thumb)
+bool BLO_write_file(Main *mainvar,
+                    const char *filepath,
+                    int write_flags,
+                    ReportList *reports,
+                    const BlendThumbnail *thumb)
 {
-	char tempname[FILE_MAX + 1];
-	eWriteWrapType ww_type;
-	WriteWrap ww;
-
-	/* path backup/restore */
-	void     *path_list_backup = NULL;
-	const int path_list_flag = (BKE_BPATH_TRAVERSE_SKIP_LIBRARY | BKE_BPATH_TRAVERSE_SKIP_MULTIFILE);
-
-	if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
-		BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* save to disk");
-		BLO_main_validate_libraries(mainvar, reports);
-		BLO_main_validate_shapekeys(mainvar, reports);
-	}
-
-	/* open temporary file, so we preserve the original in case we crash */
-	BLI_snprintf(tempname, sizeof(tempname), "%s@", filepath);
-
-	if (write_flags & G_FILE_COMPRESS) {
-		ww_type = WW_WRAP_ZLIB;
-	}
-	else {
-		ww_type = WW_WRAP_NONE;
-	}
-
-	ww_handle_init(ww_type, &ww);
-
-	if (ww.open(&ww, tempname) == false) {
-		BKE_reportf(reports, RPT_ERROR, "Cannot open file %s for writing: %s", tempname, strerror(errno));
-		return 0;
-	}
-
-	/* check if we need to backup and restore paths */
-	if (UNLIKELY((write_flags & G_FILE_RELATIVE_REMAP) && (G_FILE_SAVE_COPY & write_flags))) {
-		path_list_backup = BKE_bpath_list_backup(mainvar, path_list_flag);
-	}
-
-	/* remapping of relative paths to new file location */
-	if (write_flags & G_FILE_RELATIVE_REMAP) {
-		char dir1[FILE_MAX];
-		char dir2[FILE_MAX];
-		BLI_split_dir_part(filepath, dir1, sizeof(dir1));
-		BLI_split_dir_part(mainvar->name, dir2, sizeof(dir2));
-
-		/* just in case there is some subtle difference */
-		BLI_cleanup_dir(mainvar->name, dir1);
-		BLI_cleanup_dir(mainvar->name, dir2);
-
-		if (G.relbase_valid && (BLI_path_cmp(dir1, dir2) == 0)) {
-			write_flags &= ~G_FILE_RELATIVE_REMAP;
-		}
-		else {
-			if (G.relbase_valid) {
-				/* blend may not have been saved before. Tn this case
-				 * we should not have any relative paths, but if there
-				 * is somehow, an invalid or empty G_MAIN->name it will
-				 * print an error, don't try make the absolute in this case. */
-				BKE_bpath_absolute_convert(mainvar, BKE_main_blendfile_path_from_global(), NULL);
-			}
-		}
-	}
-
-	if (write_flags & G_FILE_RELATIVE_REMAP) {
-		/* note, making relative to something OTHER then G_MAIN->name */
-		BKE_bpath_relative_convert(mainvar, filepath, NULL);
-	}
-
-	/* actual file writing */
-	const bool err = write_file_handle(mainvar, &ww, NULL, NULL, write_flags, thumb);
-
-	ww.close(&ww);
-
-	if (UNLIKELY(path_list_backup)) {
-		BKE_bpath_list_restore(mainvar, path_list_flag, path_list_backup);
-		BKE_bpath_list_free(path_list_backup);
-	}
-
-	if (err) {
-		BKE_report(reports, RPT_ERROR, strerror(errno));
-		remove(tempname);
-
-		return 0;
-	}
-
-	/* file save to temporary file was successful */
-	/* now do reverse file history (move .blend1 -> .blend2, .blend -> .blend1) */
-	if (write_flags & G_FILE_HISTORY) {
-		const bool err_hist = do_history(filepath, reports);
-		if (err_hist) {
-			BKE_report(reports, RPT_ERROR, "Version backup failed (file saved with @)");
-			return 0;
-		}
-	}
-
-	if (BLI_rename(tempname, filepath) != 0) {
-		BKE_report(reports, RPT_ERROR, "Cannot change old file (file saved with @)");
-		return 0;
-	}
-
-	if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
-		BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* save to disk");
-		BLO_main_validate_libraries(mainvar, reports);
-	}
-
-	return 1;
+  char tempname[FILE_MAX + 1];
+  eWriteWrapType ww_type;
+  WriteWrap ww;
+
+  /* path backup/restore */
+  void *path_list_backup = NULL;
+  const int path_list_flag = (BKE_BPATH_TRAVERSE_SKIP_LIBRARY | BKE_BPATH_TRAVERSE_SKIP_MULTIFILE);
+
+  if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
+    BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* save to disk");
+    BLO_main_validate_libraries(mainvar, reports);
+    BLO_main_validate_shapekeys(mainvar, reports);
+  }
+
+  /* open temporary file, so we preserve the original in case we crash */
+  BLI_snprintf(tempname, sizeof(tempname), "%s@", filepath);
+
+  if (write_flags & G_FILE_COMPRESS) {
+    ww_type = WW_WRAP_ZLIB;
+  }
+  else {
+    ww_type = WW_WRAP_NONE;
+  }
+
+  ww_handle_init(ww_type, &ww);
+
+  if (ww.open(&ww, tempname) == false) {
+    BKE_reportf(
+        reports, RPT_ERROR, "Cannot open file %s for writing: %s", tempname, strerror(errno));
+    return 0;
+  }
+
+  /* check if we need to backup and restore paths */
+  if (UNLIKELY((write_flags & G_FILE_RELATIVE_REMAP) && (G_FILE_SAVE_COPY & write_flags))) {
+    path_list_backup = BKE_bpath_list_backup(mainvar, path_list_flag);
+  }
+
+  /* remapping of relative paths to new file location */
+  if (write_flags & G_FILE_RELATIVE_REMAP) {
+    char dir1[FILE_MAX];
+    char dir2[FILE_MAX];
+    BLI_split_dir_part(filepath, dir1, sizeof(dir1));
+    BLI_split_dir_part(mainvar->name, dir2, sizeof(dir2));
+
+    /* just in case there is some subtle difference */
+    BLI_cleanup_dir(mainvar->name, dir1);
+    BLI_cleanup_dir(mainvar->name, dir2);
+
+    if (G.relbase_valid && (BLI_path_cmp(dir1, dir2) == 0)) {
+      write_flags &= ~G_FILE_RELATIVE_REMAP;
+    }
+    else {
+      if (G.relbase_valid) {
+        /* blend may not have been saved before. Tn this case
+         * we should not have any relative paths, but if there
+         * is somehow, an invalid or empty G_MAIN->name it will
+         * print an error, don't try make the absolute in this case. */
+        BKE_bpath_absolute_convert(mainvar, BKE_main_blendfile_path_from_global(), NULL);
+      }
+    }
+  }
+
+  if (write_flags & G_FILE_RELATIVE_REMAP) {
+    /* note, making relative to something OTHER then G_MAIN->name */
+    BKE_bpath_relative_convert(mainvar, filepath, NULL);
+  }
+
+  /* actual file writing */
+  const bool err = write_file_handle(mainvar, &ww, NULL, NULL, write_flags, thumb);
+
+  ww.close(&ww);
+
+  if (UNLIKELY(path_list_backup)) {
+    BKE_bpath_list_restore(mainvar, path_list_flag, path_list_backup);
+    BKE_bpath_list_free(path_list_backup);
+  }
+
+  if (err) {
+    BKE_report(reports, RPT_ERROR, strerror(errno));
+    remove(tempname);
+
+    return 0;
+  }
+
+  /* file save to temporary file was successful */
+  /* now do reverse file history (move .blend1 -> .blend2, .blend -> .blend1) */
+  if (write_flags & G_FILE_HISTORY) {
+    const bool err_hist = do_history(filepath, reports);
+    if (err_hist) {
+      BKE_report(reports, RPT_ERROR, "Version backup failed (file saved with @)");
+      return 0;
+    }
+  }
+
+  if (BLI_rename(tempname, filepath) != 0) {
+    BKE_report(reports, RPT_ERROR, "Cannot change old file (file saved with @)");
+    return 0;
+  }
+
+  if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
+    BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* save to disk");
+    BLO_main_validate_libraries(mainvar, reports);
+  }
+
+  return 1;
 }
 
 /**
@@ -4234,11 +4253,11 @@ bool BLO_write_file(
  */
 bool BLO_write_file_mem(Main *mainvar, MemFile *compare, MemFile *current, int write_flags)
 {
-	write_flags &= ~G_FILE_USERPREFS;
+  write_flags &= ~G_FILE_USERPREFS;
 
-	const bool err = write_file_handle(mainvar, NULL, compare, current, write_flags, NULL);
+  const bool err = write_file_handle(mainvar, NULL, compare, current, write_flags, NULL);
 
-	return (err == 0);
+  return (err == 0);
 }
 
 /** \} */