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, 1615 insertions, 1629 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 9f81eb854ea..28eb481ffd4 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include "DNA_color_types.h"  /* color management */
-#include "DNA_customdata_types.h"  /* Scene's runtime cddata masks. */
+#include "DNA_color_types.h"      /* color management */
+#include "DNA_customdata_types.h" /* Scene's runtime cddata masks. */
 #include "DNA_vec_types.h"
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
@@ -71,60 +71,60 @@ struct bNodeTree;
 /* Output Format Data */
 
 typedef struct AviCodecData {
-	/** Save format. */
-	void			*lpFormat;
-	/** Compressor options. */
-	void			*lpParms;
-	/** Size of lpFormat buffer. */
-	unsigned int	cbFormat;
-	/** Size of lpParms buffer. */
-	unsigned int	cbParms;
-
-	/** Stream type, for consistency. */
-	unsigned int	fccType;
-	/** Compressor. */
-	unsigned int	fccHandler;
-	/** Keyframe rate. */
-	unsigned int	dwKeyFrameEvery;
-	/** Compress quality 0-10,000. */
-	unsigned int	dwQuality;
-	/** Bytes per second. */
-	unsigned int	dwBytesPerSecond;
-	/** Flags... see below. */
-	unsigned int	dwFlags;
-	/** For non-video streams only. */
-	unsigned int	dwInterleaveEvery;
-	char _pad[4];
-
-	char			avicodecname[128];
+  /** Save format. */
+  void *lpFormat;
+  /** Compressor options. */
+  void *lpParms;
+  /** Size of lpFormat buffer. */
+  unsigned int cbFormat;
+  /** Size of lpParms buffer. */
+  unsigned int cbParms;
+
+  /** Stream type, for consistency. */
+  unsigned int fccType;
+  /** Compressor. */
+  unsigned int fccHandler;
+  /** Keyframe rate. */
+  unsigned int dwKeyFrameEvery;
+  /** Compress quality 0-10,000. */
+  unsigned int dwQuality;
+  /** Bytes per second. */
+  unsigned int dwBytesPerSecond;
+  /** Flags... see below. */
+  unsigned int dwFlags;
+  /** For non-video streams only. */
+  unsigned int dwInterleaveEvery;
+  char _pad[4];
+
+  char avicodecname[128];
 } AviCodecData;
 
 typedef enum eFFMpegPreset {
-	FFM_PRESET_NONE,
+  FFM_PRESET_NONE,
 
 #ifdef DNA_DEPRECATED
-	/* Previously used by h.264 to control encoding speed vs. file size. */
-	FFM_PRESET_ULTRAFAST, /* DEPRECATED */
-	FFM_PRESET_SUPERFAST, /* DEPRECATED */
-	FFM_PRESET_VERYFAST,  /* DEPRECATED */
-	FFM_PRESET_FASTER,    /* DEPRECATED */
-	FFM_PRESET_FAST,      /* DEPRECATED */
-	FFM_PRESET_MEDIUM,    /* DEPRECATED */
-	FFM_PRESET_SLOW,      /* DEPRECATED */
-	FFM_PRESET_SLOWER,    /* DEPRECATED */
-	FFM_PRESET_VERYSLOW,  /* DEPRECATED */
+  /* Previously used by h.264 to control encoding speed vs. file size. */
+  FFM_PRESET_ULTRAFAST, /* DEPRECATED */
+  FFM_PRESET_SUPERFAST, /* DEPRECATED */
+  FFM_PRESET_VERYFAST,  /* DEPRECATED */
+  FFM_PRESET_FASTER,    /* DEPRECATED */
+  FFM_PRESET_FAST,      /* DEPRECATED */
+  FFM_PRESET_MEDIUM,    /* DEPRECATED */
+  FFM_PRESET_SLOW,      /* DEPRECATED */
+  FFM_PRESET_SLOWER,    /* DEPRECATED */
+  FFM_PRESET_VERYSLOW,  /* DEPRECATED */
 #endif
 
-	/* Used by WEBM/VP9 and h.264 to control encoding speed vs. file size.
-	 * WEBM/VP9 use these values directly, whereas h.264 map those to
-	 * respectively the MEDIUM, SLOWER, and SUPERFAST presets.
-	 */
-	/** the default and recommended for most applications */
-	FFM_PRESET_GOOD = 10,
-	/** recommended if you have lots of time and want the best compression efficiency */
-	FFM_PRESET_BEST,
-	/** recommended for live / fast encoding */
-	FFM_PRESET_REALTIME,
+  /* Used by WEBM/VP9 and h.264 to control encoding speed vs. file size.
+   * WEBM/VP9 use these values directly, whereas h.264 map those to
+   * respectively the MEDIUM, SLOWER, and SUPERFAST presets.
+   */
+  /** the default and recommended for most applications */
+  FFM_PRESET_GOOD = 10,
+  /** recommended if you have lots of time and want the best compression efficiency */
+  FFM_PRESET_BEST,
+  /** recommended for live / fast encoding */
+  FFM_PRESET_REALTIME,
 } eFFMpegPreset;
 
 /* Mapping from easily-understandable descriptions to CRF values.
@@ -134,65 +134,65 @@ typedef enum eFFMpegPreset {
  * to https://trac.ffmpeg.org/wiki/Encode/H.264#a1.ChooseaCRFvalue
  */
 typedef enum eFFMpegCrf {
-	FFM_CRF_NONE = -1,
-	FFM_CRF_LOSSLESS = 0,
-	FFM_CRF_PERC_LOSSLESS = 17,
-	FFM_CRF_HIGH = 20,
-	FFM_CRF_MEDIUM = 23,
-	FFM_CRF_LOW = 26,
-	FFM_CRF_VERYLOW = 29,
-	FFM_CRF_LOWEST = 32,
+  FFM_CRF_NONE = -1,
+  FFM_CRF_LOSSLESS = 0,
+  FFM_CRF_PERC_LOSSLESS = 17,
+  FFM_CRF_HIGH = 20,
+  FFM_CRF_MEDIUM = 23,
+  FFM_CRF_LOW = 26,
+  FFM_CRF_VERYLOW = 29,
+  FFM_CRF_LOWEST = 32,
 } eFFMpegCrf;
 
 typedef enum eFFMpegAudioChannels {
-	FFM_CHANNELS_MONO = 1,
-	FFM_CHANNELS_STEREO = 2,
-	FFM_CHANNELS_SURROUND4 = 4,
-	FFM_CHANNELS_SURROUND51 = 6,
-	FFM_CHANNELS_SURROUND71 = 8,
+  FFM_CHANNELS_MONO = 1,
+  FFM_CHANNELS_STEREO = 2,
+  FFM_CHANNELS_SURROUND4 = 4,
+  FFM_CHANNELS_SURROUND51 = 6,
+  FFM_CHANNELS_SURROUND71 = 8,
 } eFFMpegAudioChannels;
 
 typedef struct FFMpegCodecData {
-	int type;
-	int codec;
-	int audio_codec;
-	int video_bitrate;
-	int audio_bitrate;
-	int audio_mixrate;
-	int audio_channels;
-	char _pad0[4];
-	float audio_volume;
-	int gop_size;
-	/** Only used if FFMPEG_USE_MAX_B_FRAMES flag is set. */
-	int max_b_frames;
-	int flags;
-	int constant_rate_factor;
-	/** See eFFMpegPreset. */
-	int ffmpeg_preset;
-
-	int rc_min_rate;
-	int rc_max_rate;
-	int rc_buffer_size;
-	int mux_packet_size;
-	int mux_rate;
-	char _pad1[4];
-
-	IDProperty *properties;
+  int type;
+  int codec;
+  int audio_codec;
+  int video_bitrate;
+  int audio_bitrate;
+  int audio_mixrate;
+  int audio_channels;
+  char _pad0[4];
+  float audio_volume;
+  int gop_size;
+  /** Only used if FFMPEG_USE_MAX_B_FRAMES flag is set. */
+  int max_b_frames;
+  int flags;
+  int constant_rate_factor;
+  /** See eFFMpegPreset. */
+  int ffmpeg_preset;
+
+  int rc_min_rate;
+  int rc_max_rate;
+  int rc_buffer_size;
+  int mux_packet_size;
+  int mux_rate;
+  char _pad1[4];
+
+  IDProperty *properties;
 } FFMpegCodecData;
 
 /* ************************************************************* */
 /* Audio */
 
 typedef struct AudioData {
-	int mixrate; // 2.5: now in FFMpegCodecData: audio_mixrate
-	float main; // 2.5: now in FFMpegCodecData: audio_volume
-	float speed_of_sound;
-	float doppler_factor;
-	int distance_model;
-	short flag;
-	char _pad[2];
-	float volume;
-	char _pad2[4];
+  int mixrate;  // 2.5: now in FFMpegCodecData: audio_mixrate
+  float main;   // 2.5: now in FFMpegCodecData: audio_volume
+  float speed_of_sound;
+  float doppler_factor;
+  int distance_model;
+  short flag;
+  char _pad[2];
+  float volume;
+  char _pad2[4];
 } AudioData;
 
 /* *************************************************************** */
@@ -200,91 +200,91 @@ typedef struct AudioData {
 
 /* Render Layer */
 typedef struct SceneRenderLayer {
-	struct SceneRenderLayer *next, *prev;
-
-	/** MAX_NAME. */
-	char name[64] DNA_DEPRECATED;
-
-	/** Converted to ViewLayer setting. */
-	struct Material *mat_override DNA_DEPRECATED;
-
-	/** Converted to LayerCollection cycles camera visibility override. */
-	unsigned int lay DNA_DEPRECATED;
-	/** Converted to LayerCollection cycles holdout override. */
-	unsigned int lay_zmask DNA_DEPRECATED;
-	unsigned int lay_exclude DNA_DEPRECATED;
-	/** Converted to ViewLayer layflag and flag. */
-	int layflag DNA_DEPRECATED;
-
-	/* pass_xor has to be after passflag */
-	/** Pass_xor has to be after passflag. */
-	int passflag DNA_DEPRECATED;
-	/** Converted to ViewLayer passflag and flag. */
-	int pass_xor DNA_DEPRECATED;
-
-	/** Converted to ViewLayer setting. */
-	int samples DNA_DEPRECATED;
-	/** Converted to ViewLayer pass_alpha_threshold. */
-	float pass_alpha_threshold DNA_DEPRECATED;
-
-	/** Converted to ViewLayer id_properties. */
-	IDProperty *prop DNA_DEPRECATED;
-
-	/** Converted to ViewLayer freestyleConfig. */
-	struct FreestyleConfig freestyleConfig DNA_DEPRECATED;
+  struct SceneRenderLayer *next, *prev;
+
+  /** MAX_NAME. */
+  char name[64] DNA_DEPRECATED;
+
+  /** Converted to ViewLayer setting. */
+  struct Material *mat_override DNA_DEPRECATED;
+
+  /** Converted to LayerCollection cycles camera visibility override. */
+  unsigned int lay DNA_DEPRECATED;
+  /** Converted to LayerCollection cycles holdout override. */
+  unsigned int lay_zmask DNA_DEPRECATED;
+  unsigned int lay_exclude DNA_DEPRECATED;
+  /** Converted to ViewLayer layflag and flag. */
+  int layflag DNA_DEPRECATED;
+
+  /* pass_xor has to be after passflag */
+  /** Pass_xor has to be after passflag. */
+  int passflag DNA_DEPRECATED;
+  /** Converted to ViewLayer passflag and flag. */
+  int pass_xor DNA_DEPRECATED;
+
+  /** Converted to ViewLayer setting. */
+  int samples DNA_DEPRECATED;
+  /** Converted to ViewLayer pass_alpha_threshold. */
+  float pass_alpha_threshold DNA_DEPRECATED;
+
+  /** Converted to ViewLayer id_properties. */
+  IDProperty *prop DNA_DEPRECATED;
+
+  /** Converted to ViewLayer freestyleConfig. */
+  struct FreestyleConfig freestyleConfig DNA_DEPRECATED;
 } SceneRenderLayer;
 
 /* SceneRenderLayer.layflag */
-#define SCE_LAY_SOLID   (1 << 0)
-#define SCE_LAY_ZTRA    (1 << 1)
-#define SCE_LAY_HALO    (1 << 2)
-#define SCE_LAY_EDGE    (1 << 3)
-#define SCE_LAY_SKY     (1 << 4)
-#define SCE_LAY_STRAND  (1 << 5)
-#define SCE_LAY_FRS     (1 << 6)
-#define SCE_LAY_AO      (1 << 7)
-	/* flags between (1 << 8) and (1 << 15) are set to 1 already, for future options */
-
-#define SCE_LAY_ALL_Z       (1 << 15)
-/* #define SCE_LAY_XOR         (1 << 16) */  /* UNUSED */
-#define SCE_LAY_DISABLE     (1 << 17)
-#define SCE_LAY_ZMASK       (1 << 18)
-#define SCE_LAY_NEG_ZMASK   (1 << 19)
+#define SCE_LAY_SOLID (1 << 0)
+#define SCE_LAY_ZTRA (1 << 1)
+#define SCE_LAY_HALO (1 << 2)
+#define SCE_LAY_EDGE (1 << 3)
+#define SCE_LAY_SKY (1 << 4)
+#define SCE_LAY_STRAND (1 << 5)
+#define SCE_LAY_FRS (1 << 6)
+#define SCE_LAY_AO (1 << 7)
+/* flags between (1 << 8) and (1 << 15) are set to 1 already, for future options */
+
+#define SCE_LAY_ALL_Z (1 << 15)
+/* #define SCE_LAY_XOR         (1 << 16) */ /* UNUSED */
+#define SCE_LAY_DISABLE (1 << 17)
+#define SCE_LAY_ZMASK (1 << 18)
+#define SCE_LAY_NEG_ZMASK (1 << 19)
 
 /* SceneRenderLayer.passflag */
 typedef enum eScenePassType {
-	SCE_PASS_COMBINED                 = (1 << 0),
-	SCE_PASS_Z                        = (1 << 1),
-	SCE_PASS_UNUSED_1                 = (1 << 2), /* RGBA */
-	SCE_PASS_UNUSED_2                 = (1 << 3), /* DIFFUSE */
-	SCE_PASS_UNUSED_3                 = (1 << 4), /* SPEC */
-	SCE_PASS_SHADOW                   = (1 << 5),
-	SCE_PASS_AO                       = (1 << 6),
-	SCE_PASS_UNUSED_4                 = (1 << 7), /* REFLECT */
-	SCE_PASS_NORMAL                   = (1 << 8),
-	SCE_PASS_VECTOR                   = (1 << 9),
-	SCE_PASS_UNUSED_5                 = (1 << 10), /* REFRACT */
-	SCE_PASS_INDEXOB                  = (1 << 11),
-	SCE_PASS_UV                       = (1 << 12),
-	SCE_PASS_UNUSED_6                 = (1 << 13), /* INDIRECT */
-	SCE_PASS_MIST                     = (1 << 14),
-	SCE_PASS_RAYHITS                  = (1 << 15),
-	SCE_PASS_EMIT                     = (1 << 16),
-	SCE_PASS_ENVIRONMENT              = (1 << 17),
-	SCE_PASS_INDEXMA                  = (1 << 18),
-	SCE_PASS_DIFFUSE_DIRECT           = (1 << 19),
-	SCE_PASS_DIFFUSE_INDIRECT         = (1 << 20),
-	SCE_PASS_DIFFUSE_COLOR            = (1 << 21),
-	SCE_PASS_GLOSSY_DIRECT            = (1 << 22),
-	SCE_PASS_GLOSSY_INDIRECT          = (1 << 23),
-	SCE_PASS_GLOSSY_COLOR             = (1 << 24),
-	SCE_PASS_TRANSM_DIRECT            = (1 << 25),
-	SCE_PASS_TRANSM_INDIRECT          = (1 << 26),
-	SCE_PASS_TRANSM_COLOR             = (1 << 27),
-	SCE_PASS_SUBSURFACE_DIRECT        = (1 << 28),
-	SCE_PASS_SUBSURFACE_INDIRECT      = (1 << 29),
-	SCE_PASS_SUBSURFACE_COLOR         = (1 << 30),
-	SCE_PASS_ROUGHNESS                = (1u << 31u),
+  SCE_PASS_COMBINED = (1 << 0),
+  SCE_PASS_Z = (1 << 1),
+  SCE_PASS_UNUSED_1 = (1 << 2), /* RGBA */
+  SCE_PASS_UNUSED_2 = (1 << 3), /* DIFFUSE */
+  SCE_PASS_UNUSED_3 = (1 << 4), /* SPEC */
+  SCE_PASS_SHADOW = (1 << 5),
+  SCE_PASS_AO = (1 << 6),
+  SCE_PASS_UNUSED_4 = (1 << 7), /* REFLECT */
+  SCE_PASS_NORMAL = (1 << 8),
+  SCE_PASS_VECTOR = (1 << 9),
+  SCE_PASS_UNUSED_5 = (1 << 10), /* REFRACT */
+  SCE_PASS_INDEXOB = (1 << 11),
+  SCE_PASS_UV = (1 << 12),
+  SCE_PASS_UNUSED_6 = (1 << 13), /* INDIRECT */
+  SCE_PASS_MIST = (1 << 14),
+  SCE_PASS_RAYHITS = (1 << 15),
+  SCE_PASS_EMIT = (1 << 16),
+  SCE_PASS_ENVIRONMENT = (1 << 17),
+  SCE_PASS_INDEXMA = (1 << 18),
+  SCE_PASS_DIFFUSE_DIRECT = (1 << 19),
+  SCE_PASS_DIFFUSE_INDIRECT = (1 << 20),
+  SCE_PASS_DIFFUSE_COLOR = (1 << 21),
+  SCE_PASS_GLOSSY_DIRECT = (1 << 22),
+  SCE_PASS_GLOSSY_INDIRECT = (1 << 23),
+  SCE_PASS_GLOSSY_COLOR = (1 << 24),
+  SCE_PASS_TRANSM_DIRECT = (1 << 25),
+  SCE_PASS_TRANSM_INDIRECT = (1 << 26),
+  SCE_PASS_TRANSM_COLOR = (1 << 27),
+  SCE_PASS_SUBSURFACE_DIRECT = (1 << 28),
+  SCE_PASS_SUBSURFACE_INDIRECT = (1 << 29),
+  SCE_PASS_SUBSURFACE_COLOR = (1 << 30),
+  SCE_PASS_ROUGHNESS = (1u << 31u),
 } eScenePassType;
 
 #define RE_PASSNAME_DEPRECATED "Deprecated"
@@ -318,76 +318,75 @@ typedef enum eScenePassType {
 #define RE_PASSNAME_SUBSURFACE_INDIRECT "SubsurfaceInd"
 #define RE_PASSNAME_SUBSURFACE_COLOR "SubsurfaceCol"
 
-
 /* View - MultiView */
 typedef struct SceneRenderView {
-	struct SceneRenderView *next, *prev;
+  struct SceneRenderView *next, *prev;
 
-	/** MAX_NAME. */
-	char name[64];
-	/** MAX_NAME. */
-	char suffix[64];
+  /** MAX_NAME. */
+  char name[64];
+  /** MAX_NAME. */
+  char suffix[64];
 
-	int viewflag;
-	char _pad2[4];
+  int viewflag;
+  char _pad2[4];
 
 } SceneRenderView;
 
 /* SceneRenderView.viewflag */
-#define SCE_VIEW_DISABLE		(1 << 0)
+#define SCE_VIEW_DISABLE (1 << 0)
 
 /* RenderData.views_format */
 enum {
-	SCE_VIEWS_FORMAT_STEREO_3D = 0,
-	SCE_VIEWS_FORMAT_MULTIVIEW = 1,
+  SCE_VIEWS_FORMAT_STEREO_3D = 0,
+  SCE_VIEWS_FORMAT_MULTIVIEW = 1,
 };
 
 /* ImageFormatData.views_format (also used for Sequence.views_format) */
 enum {
-	R_IMF_VIEWS_INDIVIDUAL = 0,
-	R_IMF_VIEWS_STEREO_3D  = 1,
-	R_IMF_VIEWS_MULTIVIEW  = 2,
+  R_IMF_VIEWS_INDIVIDUAL = 0,
+  R_IMF_VIEWS_STEREO_3D = 1,
+  R_IMF_VIEWS_MULTIVIEW = 2,
 };
 
 typedef struct Stereo3dFormat {
-	short flag;
-	/** Encoding mode. */
-	char display_mode;
-	/** Anaglyph scheme for the user display. */
-	char anaglyph_type;
-	/** Interlace type for the user display. */
-	char interlace_type;
-	char _pad[3];
+  short flag;
+  /** Encoding mode. */
+  char display_mode;
+  /** Anaglyph scheme for the user display. */
+  char anaglyph_type;
+  /** Interlace type for the user display. */
+  char interlace_type;
+  char _pad[3];
 } Stereo3dFormat;
 
 /* Stereo3dFormat.display_mode */
 typedef enum eStereoDisplayMode {
-	S3D_DISPLAY_ANAGLYPH    = 0,
-	S3D_DISPLAY_INTERLACE   = 1,
-	S3D_DISPLAY_PAGEFLIP    = 2,
-	S3D_DISPLAY_SIDEBYSIDE  = 3,
-	S3D_DISPLAY_TOPBOTTOM   = 4,
+  S3D_DISPLAY_ANAGLYPH = 0,
+  S3D_DISPLAY_INTERLACE = 1,
+  S3D_DISPLAY_PAGEFLIP = 2,
+  S3D_DISPLAY_SIDEBYSIDE = 3,
+  S3D_DISPLAY_TOPBOTTOM = 4,
 } eStereoDisplayMode;
 
 /* Stereo3dFormat.flag */
 typedef enum eStereo3dFlag {
-	S3D_INTERLACE_SWAP        = (1 << 0),
-	S3D_SIDEBYSIDE_CROSSEYED  = (1 << 1),
-	S3D_SQUEEZED_FRAME        = (1 << 2),
+  S3D_INTERLACE_SWAP = (1 << 0),
+  S3D_SIDEBYSIDE_CROSSEYED = (1 << 1),
+  S3D_SQUEEZED_FRAME = (1 << 2),
 } eStereo3dFlag;
 
 /* Stereo3dFormat.anaglyph_type */
 typedef enum eStereo3dAnaglyphType {
-	S3D_ANAGLYPH_REDCYAN      = 0,
-	S3D_ANAGLYPH_GREENMAGENTA = 1,
-	S3D_ANAGLYPH_YELLOWBLUE   = 2,
+  S3D_ANAGLYPH_REDCYAN = 0,
+  S3D_ANAGLYPH_GREENMAGENTA = 1,
+  S3D_ANAGLYPH_YELLOWBLUE = 2,
 } eStereo3dAnaglyphType;
 
 /* Stereo3dFormat.interlace_type */
 typedef enum eStereo3dInterlaceType {
-	S3D_INTERLACE_ROW          = 0,
-	S3D_INTERLACE_COLUMN       = 1,
-	S3D_INTERLACE_CHECKERBOARD = 2,
+  S3D_INTERLACE_ROW = 0,
+  S3D_INTERLACE_COLUMN = 1,
+  S3D_INTERLACE_CHECKERBOARD = 2,
 } eStereo3dInterlaceType;
 
 /* *************************************************************** */
@@ -400,95 +399,93 @@ typedef enum eStereo3dInterlaceType {
  * RNA ensures these enum's are only selectable for render output.
  */
 typedef struct ImageFormatData {
-	/**
-	 * R_IMF_IMTYPE_PNG, R_...
-	 * \note, video types should only ever be set from this structure when used from RenderData.
-	 */
-	char imtype;
-	/**
-	 * bits per channel, R_IMF_CHAN_DEPTH_8 -> 32,
-	 * not a flag, only set 1 at a time. */
-	char depth;
-
-	/** R_IMF_PLANES_BW, R_IMF_PLANES_RGB, R_IMF_PLANES_RGBA. */
-	char planes;
-	/** Generic options for all image types, alpha zbuffer. */
-	char flag;
-
-	/** (0 - 100), eg: jpeg quality. */
-	char quality;
-	/** (0 - 100), eg: png compression. */
-	char compress;
-
-
-	/* --- format specific --- */
-
-	/* OpenEXR */
-	char  exr_codec;
-
-	/* Cineon */
-	char  cineon_flag;
-	short cineon_white, cineon_black;
-	float cineon_gamma;
-
-	/* Jpeg2000 */
-	char  jp2_flag;
-	char jp2_codec;
-
-	/* TIFF */
-	char tiff_codec;
-
-	char _pad[4];
-
-	/* Multiview */
-	char views_format;
-	Stereo3dFormat stereo3d_format;
-
-	/* color management */
-	ColorManagedViewSettings view_settings;
-	ColorManagedDisplaySettings display_settings;
+  /**
+   * R_IMF_IMTYPE_PNG, R_...
+   * \note, video types should only ever be set from this structure when used from RenderData.
+   */
+  char imtype;
+  /**
+   * bits per channel, R_IMF_CHAN_DEPTH_8 -> 32,
+   * not a flag, only set 1 at a time. */
+  char depth;
+
+  /** R_IMF_PLANES_BW, R_IMF_PLANES_RGB, R_IMF_PLANES_RGBA. */
+  char planes;
+  /** Generic options for all image types, alpha zbuffer. */
+  char flag;
+
+  /** (0 - 100), eg: jpeg quality. */
+  char quality;
+  /** (0 - 100), eg: png compression. */
+  char compress;
+
+  /* --- format specific --- */
+
+  /* OpenEXR */
+  char exr_codec;
+
+  /* Cineon */
+  char cineon_flag;
+  short cineon_white, cineon_black;
+  float cineon_gamma;
+
+  /* Jpeg2000 */
+  char jp2_flag;
+  char jp2_codec;
+
+  /* TIFF */
+  char tiff_codec;
+
+  char _pad[4];
+
+  /* Multiview */
+  char views_format;
+  Stereo3dFormat stereo3d_format;
+
+  /* color management */
+  ColorManagedViewSettings view_settings;
+  ColorManagedDisplaySettings display_settings;
 } ImageFormatData;
 
-
 /* ImageFormatData.imtype */
-#define R_IMF_IMTYPE_TARGA           0
-#define R_IMF_IMTYPE_IRIS            1
+#define R_IMF_IMTYPE_TARGA 0
+#define R_IMF_IMTYPE_IRIS 1
 /* #define R_HAMX                    2 */ /* hamx is nomore */
 /* #define R_FTYPE                   3 */ /* ftype is nomore */
-#define R_IMF_IMTYPE_JPEG90          4
+#define R_IMF_IMTYPE_JPEG90 4
 /* #define R_MOVIE                   5 */ /* movie is nomore */
-#define R_IMF_IMTYPE_IRIZ            7
-#define R_IMF_IMTYPE_RAWTGA         14
-#define R_IMF_IMTYPE_AVIRAW         15
-#define R_IMF_IMTYPE_AVIJPEG        16
-#define R_IMF_IMTYPE_PNG            17
+#define R_IMF_IMTYPE_IRIZ 7
+#define R_IMF_IMTYPE_RAWTGA 14
+#define R_IMF_IMTYPE_AVIRAW 15
+#define R_IMF_IMTYPE_AVIJPEG 16
+#define R_IMF_IMTYPE_PNG 17
 /* #define R_IMF_IMTYPE_AVICODEC    18 */ /* avicodec is nomore */
 /* #define R_IMF_IMTYPE_QUICKTIME   19 */ /* quicktime is nomore */
-#define R_IMF_IMTYPE_BMP            20
-#define R_IMF_IMTYPE_RADHDR         21
-#define R_IMF_IMTYPE_TIFF           22
-#define R_IMF_IMTYPE_OPENEXR        23
-#define R_IMF_IMTYPE_FFMPEG         24
+#define R_IMF_IMTYPE_BMP 20
+#define R_IMF_IMTYPE_RADHDR 21
+#define R_IMF_IMTYPE_TIFF 22
+#define R_IMF_IMTYPE_OPENEXR 23
+#define R_IMF_IMTYPE_FFMPEG 24
 /* #define R_IMF_IMTYPE_FRAMESERVER    25 */ /* frame server is nomore */
-#define R_IMF_IMTYPE_CINEON         26
-#define R_IMF_IMTYPE_DPX            27
-#define R_IMF_IMTYPE_MULTILAYER     28
-#define R_IMF_IMTYPE_DDS            29
-#define R_IMF_IMTYPE_JP2            30
-#define R_IMF_IMTYPE_H264           31
-#define R_IMF_IMTYPE_XVID           32
-#define R_IMF_IMTYPE_THEORA         33
-#define R_IMF_IMTYPE_PSD            34
-
-#define R_IMF_IMTYPE_INVALID        255
+#define R_IMF_IMTYPE_CINEON 26
+#define R_IMF_IMTYPE_DPX 27
+#define R_IMF_IMTYPE_MULTILAYER 28
+#define R_IMF_IMTYPE_DDS 29
+#define R_IMF_IMTYPE_JP2 30
+#define R_IMF_IMTYPE_H264 31
+#define R_IMF_IMTYPE_XVID 32
+#define R_IMF_IMTYPE_THEORA 33
+#define R_IMF_IMTYPE_PSD 34
+
+#define R_IMF_IMTYPE_INVALID 255
 
 /* ImageFormatData.flag */
-#define R_IMF_FLAG_ZBUF         (1 << 0)   /* was R_OPENEXR_ZBUF */
-#define R_IMF_FLAG_PREVIEW_JPG  (1 << 1)   /* was R_PREVIEW_JPG */
+#define R_IMF_FLAG_ZBUF (1 << 0)        /* was R_OPENEXR_ZBUF */
+#define R_IMF_FLAG_PREVIEW_JPG (1 << 1) /* was R_PREVIEW_JPG */
 
 /* return values from BKE_imtype_valid_depths, note this is depts per channel */
-#define R_IMF_CHAN_DEPTH_1  (1 << 0) /* 1bits  (unused) */
-#define R_IMF_CHAN_DEPTH_8  (1 << 1) /* 8bits  (default) */
+#define R_IMF_CHAN_DEPTH_1 (1 << 0)  /* 1bits  (unused) */
+#define R_IMF_CHAN_DEPTH_8 (1 << 1)  /* 8bits  (default) */
 #define R_IMF_CHAN_DEPTH_10 (1 << 2) /* 10bits (uncommon, Cineon/DPX support) */
 #define R_IMF_CHAN_DEPTH_12 (1 << 3) /* 12bits (uncommon, jp2/DPX support) */
 #define R_IMF_CHAN_DEPTH_16 (1 << 4) /* 16bits (tiff, halff float exr) */
@@ -496,327 +493,324 @@ typedef struct ImageFormatData {
 #define R_IMF_CHAN_DEPTH_32 (1 << 6) /* 32bits (full float exr) */
 
 /* ImageFormatData.planes */
-#define R_IMF_PLANES_RGB   24
-#define R_IMF_PLANES_RGBA  32
-#define R_IMF_PLANES_BW    8
+#define R_IMF_PLANES_RGB 24
+#define R_IMF_PLANES_RGBA 32
+#define R_IMF_PLANES_BW 8
 
 /* ImageFormatData.exr_codec */
-#define R_IMF_EXR_CODEC_NONE  0
+#define R_IMF_EXR_CODEC_NONE 0
 #define R_IMF_EXR_CODEC_PXR24 1
-#define R_IMF_EXR_CODEC_ZIP   2
-#define R_IMF_EXR_CODEC_PIZ   3
-#define R_IMF_EXR_CODEC_RLE   4
-#define R_IMF_EXR_CODEC_ZIPS  5
-#define R_IMF_EXR_CODEC_B44   6
-#define R_IMF_EXR_CODEC_B44A  7
-#define R_IMF_EXR_CODEC_DWAA  8
-#define R_IMF_EXR_CODEC_DWAB  9
-#define R_IMF_EXR_CODEC_MAX  10
+#define R_IMF_EXR_CODEC_ZIP 2
+#define R_IMF_EXR_CODEC_PIZ 3
+#define R_IMF_EXR_CODEC_RLE 4
+#define R_IMF_EXR_CODEC_ZIPS 5
+#define R_IMF_EXR_CODEC_B44 6
+#define R_IMF_EXR_CODEC_B44A 7
+#define R_IMF_EXR_CODEC_DWAA 8
+#define R_IMF_EXR_CODEC_DWAB 9
+#define R_IMF_EXR_CODEC_MAX 10
 
 /* ImageFormatData.jp2_flag */
-#define R_IMF_JP2_FLAG_YCC          (1 << 0)  /* when disabled use RGB */ /* was R_JPEG2K_YCC */
-#define R_IMF_JP2_FLAG_CINE_PRESET  (1 << 1)  /* was R_JPEG2K_CINE_PRESET */
-#define R_IMF_JP2_FLAG_CINE_48      (1 << 2)  /* was R_JPEG2K_CINE_48FPS */
+#define R_IMF_JP2_FLAG_YCC (1 << 0) /* when disabled use RGB */ /* was R_JPEG2K_YCC */
+#define R_IMF_JP2_FLAG_CINE_PRESET (1 << 1)                     /* was R_JPEG2K_CINE_PRESET */
+#define R_IMF_JP2_FLAG_CINE_48 (1 << 2)                         /* was R_JPEG2K_CINE_48FPS */
 
 /* ImageFormatData.jp2_codec */
-#define R_IMF_JP2_CODEC_JP2  0
-#define R_IMF_JP2_CODEC_J2K  1
+#define R_IMF_JP2_CODEC_JP2 0
+#define R_IMF_JP2_CODEC_J2K 1
 
 /* ImageFormatData.cineon_flag */
-#define R_IMF_CINEON_FLAG_LOG (1 << 0)  /* was R_CINEON_LOG */
+#define R_IMF_CINEON_FLAG_LOG (1 << 0) /* was R_CINEON_LOG */
 
 /* ImageFormatData.tiff_codec */
 enum {
-	R_IMF_TIFF_CODEC_DEFLATE   = 0,
-	R_IMF_TIFF_CODEC_LZW       = 1,
-	R_IMF_TIFF_CODEC_PACKBITS  = 2,
-	R_IMF_TIFF_CODEC_NONE      = 3,
+  R_IMF_TIFF_CODEC_DEFLATE = 0,
+  R_IMF_TIFF_CODEC_LZW = 1,
+  R_IMF_TIFF_CODEC_PACKBITS = 2,
+  R_IMF_TIFF_CODEC_NONE = 3,
 };
 
 typedef struct BakeData {
-	struct ImageFormatData im_format;
+  struct ImageFormatData im_format;
 
-	/** FILE_MAX. */
-	char filepath[1024];
+  /** FILE_MAX. */
+  char filepath[1024];
 
-	short width, height;
-	short margin, flag;
+  short width, height;
+  short margin, flag;
 
-	float cage_extrusion;
-	int pass_filter;
+  float cage_extrusion;
+  int pass_filter;
 
-	char normal_swizzle[3];
-	char normal_space;
+  char normal_swizzle[3];
+  char normal_space;
 
-	char save_mode;
-	char _pad[3];
+  char save_mode;
+  char _pad[3];
 
-	struct Object *cage_object;
+  struct Object *cage_object;
 } BakeData;
 
 /* BakeData.normal_swizzle (char) */
 typedef enum eBakeNormalSwizzle {
-	R_BAKE_POSX = 0,
-	R_BAKE_POSY = 1,
-	R_BAKE_POSZ = 2,
-	R_BAKE_NEGX = 3,
-	R_BAKE_NEGY = 4,
-	R_BAKE_NEGZ = 5,
+  R_BAKE_POSX = 0,
+  R_BAKE_POSY = 1,
+  R_BAKE_POSZ = 2,
+  R_BAKE_NEGX = 3,
+  R_BAKE_NEGY = 4,
+  R_BAKE_NEGZ = 5,
 } eBakeNormalSwizzle;
 
 /* BakeData.save_mode (char) */
 typedef enum eBakeSaveMode {
-	R_BAKE_SAVE_INTERNAL = 0,
-	R_BAKE_SAVE_EXTERNAL = 1,
+  R_BAKE_SAVE_INTERNAL = 0,
+  R_BAKE_SAVE_EXTERNAL = 1,
 } eBakeSaveMode;
 
 /* BakeData.pass_filter */
 typedef enum eBakePassFilter {
-	R_BAKE_PASS_FILTER_NONE           = 0,
-	R_BAKE_PASS_FILTER_AO             = (1 << 0),
-	R_BAKE_PASS_FILTER_EMIT           = (1 << 1),
-	R_BAKE_PASS_FILTER_DIFFUSE        = (1 << 2),
-	R_BAKE_PASS_FILTER_GLOSSY         = (1 << 3),
-	R_BAKE_PASS_FILTER_TRANSM         = (1 << 4),
-	R_BAKE_PASS_FILTER_SUBSURFACE     = (1 << 5),
-	R_BAKE_PASS_FILTER_DIRECT         = (1 << 6),
-	R_BAKE_PASS_FILTER_INDIRECT       = (1 << 7),
-	R_BAKE_PASS_FILTER_COLOR          = (1 << 8),
+  R_BAKE_PASS_FILTER_NONE = 0,
+  R_BAKE_PASS_FILTER_AO = (1 << 0),
+  R_BAKE_PASS_FILTER_EMIT = (1 << 1),
+  R_BAKE_PASS_FILTER_DIFFUSE = (1 << 2),
+  R_BAKE_PASS_FILTER_GLOSSY = (1 << 3),
+  R_BAKE_PASS_FILTER_TRANSM = (1 << 4),
+  R_BAKE_PASS_FILTER_SUBSURFACE = (1 << 5),
+  R_BAKE_PASS_FILTER_DIRECT = (1 << 6),
+  R_BAKE_PASS_FILTER_INDIRECT = (1 << 7),
+  R_BAKE_PASS_FILTER_COLOR = (1 << 8),
 } eBakePassFilter;
 
 #define R_BAKE_PASS_FILTER_ALL (~0)
 
 /* RenderEngineSettingsClay.options */
 typedef enum ClayFlagSettings {
-	CLAY_USE_AO     = (1 << 0),
-	CLAY_USE_HSV    = (1 << 1),
+  CLAY_USE_AO = (1 << 0),
+  CLAY_USE_HSV = (1 << 1),
 } ClayFlagSettings;
 
 /* *************************************************************** */
 /* Render Data */
 
 typedef struct RenderData {
-	struct ImageFormatData im_format;
-
-	struct AviCodecData *avicodecdata;
-	struct FFMpegCodecData ffcodecdata;
-
-	/** Frames as in 'images'. */
-	int cfra, sfra, efra;
-	/** Subframe offset from cfra, in 0.0-1.0. */
-	float subframe;
-	/** Start+end frames of preview range. */
-	int psfra, pefra;
-
-	int images, framapto;
-	short flag, threads;
-
-	float framelen, blurfac;
-
-	/** Frames to jump during render/playback. */
-	int frame_step;
-
-	/** Standalone player stereo settings */  //  XXX deprecated since .2.5
-	short stereomode  DNA_DEPRECATED;
-
-	/** For the dimensions presets menu. */
-	short dimensionspreset;
-
-	/** Size in %. */
-	short size;
-
-	char _pad6[2];
-
-	/* from buttons: */
-	/**
-	 * The desired number of pixels in the x direction
-	 */
-	int xsch;
-	/**
-	 * The desired number of pixels in the y direction
-	 */
-	int ysch;
-
-	/**
-	 * render tile dimensions
-	 */
-	int tilex, tiley;
-
-	short planes DNA_DEPRECATED;
-	short imtype DNA_DEPRECATED;
-	short subimtype  DNA_DEPRECATED;
-	short quality  DNA_DEPRECATED;
-
-	/**
-	 * Render to image editor, fullscreen or to new window.
-	 */
-	short displaymode;
-	char use_lock_interface;
-	char _pad7;
-
-	/**
-	 * Flags for render settings. Use bit-masking to access the settings.
-	 */
-	int scemode;
-
-	/**
-	 * Flags for render settings. Use bit-masking to access the settings.
-	 */
-	int mode;
-
-	/**
-	 * What to do with the sky/background.
-	 * Picks sky/premul blending for the background.
-	 */
-	short alphamode;
-
-	/**
-	 * The number of samples to use per pixel.
-	 */
-	short osa;
-
-	short frs_sec;
-	char _pad[6];
-
-
-	/* safety, border and display rect */
-	rctf safety, border;
-	rcti disprect;
-
-	/* information on different layers to be rendered */
-	/** Converted to Scene->view_layers. */
-	ListBase layers DNA_DEPRECATED;
-	/** Converted to Scene->active_layer. */
-	short actlay DNA_DEPRECATED;
-	char _pad1[2];
-
-	/**
-	 * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
-	 */
-	float xasp, yasp;
-
-	float frs_sec_base;
-
-	/**
-	 * Value used to define filter size for all filter options  */
-	float gauss;
-
-
-	/* color management settings - color profiles, gamma correction, etc */
-	int color_mgt_flag;
-
-	 /* Dither noise intensity */
-	float dither_intensity;
-
-	/* Bake Render options */
-	short bake_mode, bake_flag;
-	short bake_filter, bake_samples;
-	float bake_biasdist, bake_user_scale;
-
-	/* path to render output */
-	/** 1024 = FILE_MAX. */
-	char pic[1024];
-
-	/* stamps flags. */
-	int stamp;
-	/** Select one of blenders bitmap fonts. */
-	short stamp_font_id;
-	char _pad3[2];
-
-	/* stamp info user data. */
-	char stamp_udata[768];
-
-	/* foreground/background color. */
-	float fg_stamp[4];
-	float bg_stamp[4];
-
-	/* sequencer options */
-	char seq_prev_type;
-	/** UNUSED!. */
-	char seq_rend_type;
-	/** Flag use for sequence render/draw. */
-	char seq_flag;
-	char _pad5[5];
-
-	/* render simplify */
-	short simplify_subsurf;
-	short simplify_subsurf_render;
-	short simplify_gpencil;
-	short simplify_smoke_ignore_highres;
-	float simplify_particles;
-	float simplify_particles_render;
-
-	/* Freestyle line thickness options */
-	int line_thickness_mode;
-	/** In pixels. */
-	float unit_line_thickness;
-
-	/* render engine */
-	char engine[32];
-	char _pad2[4];
-
-	/* Cycles baking */
-	struct BakeData bake;
-
-	int preview_start_resolution;
-	short preview_pixel_size;
-
-	/* Type of the debug pass to use.
-	 * Only used when built with debug passes support.
-	 */
-	short debug_pass_type;
-
-	/* MultiView */
-	/** SceneRenderView. */
-	ListBase views;
-	short actview;
-	short views_format;
-
-	/* Hair Display */
-	short hair_type, hair_subdiv;
-
-	/* Motion blur shutter */
-	struct CurveMapping mblur_shutter_curve;
+  struct ImageFormatData im_format;
+
+  struct AviCodecData *avicodecdata;
+  struct FFMpegCodecData ffcodecdata;
+
+  /** Frames as in 'images'. */
+  int cfra, sfra, efra;
+  /** Subframe offset from cfra, in 0.0-1.0. */
+  float subframe;
+  /** Start+end frames of preview range. */
+  int psfra, pefra;
+
+  int images, framapto;
+  short flag, threads;
+
+  float framelen, blurfac;
+
+  /** Frames to jump during render/playback. */
+  int frame_step;
+
+  /** Standalone player stereo settings */  //  XXX deprecated since .2.5
+  short stereomode DNA_DEPRECATED;
+
+  /** For the dimensions presets menu. */
+  short dimensionspreset;
+
+  /** Size in %. */
+  short size;
+
+  char _pad6[2];
+
+  /* from buttons: */
+  /**
+   * The desired number of pixels in the x direction
+   */
+  int xsch;
+  /**
+   * The desired number of pixels in the y direction
+   */
+  int ysch;
+
+  /**
+   * render tile dimensions
+   */
+  int tilex, tiley;
+
+  short planes DNA_DEPRECATED;
+  short imtype DNA_DEPRECATED;
+  short subimtype DNA_DEPRECATED;
+  short quality DNA_DEPRECATED;
+
+  /**
+   * Render to image editor, fullscreen or to new window.
+   */
+  short displaymode;
+  char use_lock_interface;
+  char _pad7;
+
+  /**
+   * Flags for render settings. Use bit-masking to access the settings.
+   */
+  int scemode;
+
+  /**
+   * Flags for render settings. Use bit-masking to access the settings.
+   */
+  int mode;
+
+  /**
+   * What to do with the sky/background.
+   * Picks sky/premul blending for the background.
+   */
+  short alphamode;
+
+  /**
+   * The number of samples to use per pixel.
+   */
+  short osa;
+
+  short frs_sec;
+  char _pad[6];
+
+  /* safety, border and display rect */
+  rctf safety, border;
+  rcti disprect;
+
+  /* information on different layers to be rendered */
+  /** Converted to Scene->view_layers. */
+  ListBase layers DNA_DEPRECATED;
+  /** Converted to Scene->active_layer. */
+  short actlay DNA_DEPRECATED;
+  char _pad1[2];
+
+  /**
+   * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
+   */
+  float xasp, yasp;
+
+  float frs_sec_base;
+
+  /**
+   * Value used to define filter size for all filter options  */
+  float gauss;
+
+  /* color management settings - color profiles, gamma correction, etc */
+  int color_mgt_flag;
+
+  /* Dither noise intensity */
+  float dither_intensity;
+
+  /* Bake Render options */
+  short bake_mode, bake_flag;
+  short bake_filter, bake_samples;
+  float bake_biasdist, bake_user_scale;
+
+  /* path to render output */
+  /** 1024 = FILE_MAX. */
+  char pic[1024];
+
+  /* stamps flags. */
+  int stamp;
+  /** Select one of blenders bitmap fonts. */
+  short stamp_font_id;
+  char _pad3[2];
+
+  /* stamp info user data. */
+  char stamp_udata[768];
+
+  /* foreground/background color. */
+  float fg_stamp[4];
+  float bg_stamp[4];
+
+  /* sequencer options */
+  char seq_prev_type;
+  /** UNUSED!. */
+  char seq_rend_type;
+  /** Flag use for sequence render/draw. */
+  char seq_flag;
+  char _pad5[5];
+
+  /* render simplify */
+  short simplify_subsurf;
+  short simplify_subsurf_render;
+  short simplify_gpencil;
+  short simplify_smoke_ignore_highres;
+  float simplify_particles;
+  float simplify_particles_render;
+
+  /* Freestyle line thickness options */
+  int line_thickness_mode;
+  /** In pixels. */
+  float unit_line_thickness;
+
+  /* render engine */
+  char engine[32];
+  char _pad2[4];
+
+  /* Cycles baking */
+  struct BakeData bake;
+
+  int preview_start_resolution;
+  short preview_pixel_size;
+
+  /* Type of the debug pass to use.
+   * Only used when built with debug passes support.
+   */
+  short debug_pass_type;
+
+  /* MultiView */
+  /** SceneRenderView. */
+  ListBase views;
+  short actview;
+  short views_format;
+
+  /* Hair Display */
+  short hair_type, hair_subdiv;
+
+  /* Motion blur shutter */
+  struct CurveMapping mblur_shutter_curve;
 } RenderData;
 
 /* RenderData.hair_type */
 typedef enum eHairType {
-	SCE_HAIR_SHAPE_STRAND      = 0,
-	SCE_HAIR_SHAPE_STRIP       = 1,
+  SCE_HAIR_SHAPE_STRAND = 0,
+  SCE_HAIR_SHAPE_STRIP = 1,
 } eHairType;
 
-
 /* *************************************************************** */
 /* Render Conversion/Simplfication Settings */
 
 /* control render convert and shading engine */
 typedef struct RenderProfile {
-	struct RenderProfile *next, *prev;
-	char name[32];
+  struct RenderProfile *next, *prev;
+  char name[32];
 
-	short particle_perc;
-	short subsurf_max;
-	short shadbufsample_max;
-	char _pad1[2];
+  short particle_perc;
+  short subsurf_max;
+  short shadbufsample_max;
+  char _pad1[2];
 
-	float ao_error;
-	char _pad2[4];
+  float ao_error;
+  char _pad2[4];
 
 } RenderProfile;
 
 /* UV Paint */
 /* ToolSettings.uv_sculpt_settings */
-#define UV_SCULPT_LOCK_BORDERS				1
-#define UV_SCULPT_ALL_ISLANDS				2
+#define UV_SCULPT_LOCK_BORDERS 1
+#define UV_SCULPT_ALL_ISLANDS 2
 
 /* ToolSettings.uv_sculpt_tool */
-#define UV_SCULPT_TOOL_PINCH				1
-#define UV_SCULPT_TOOL_RELAX				2
-#define UV_SCULPT_TOOL_GRAB					3
+#define UV_SCULPT_TOOL_PINCH 1
+#define UV_SCULPT_TOOL_RELAX 2
+#define UV_SCULPT_TOOL_GRAB 3
 
 /* ToolSettings.uv_relax_method */
-#define UV_SCULPT_TOOL_RELAX_LAPLACIAN	1
-#define UV_SCULPT_TOOL_RELAX_HC			2
+#define UV_SCULPT_TOOL_RELAX_LAPLACIAN 1
+#define UV_SCULPT_TOOL_RELAX_HC 2
 
 /* Stereo Flags */
 #define STEREO_RIGHT_NAME "right"
@@ -826,21 +820,21 @@ typedef struct RenderProfile {
 
 /* View3D.stereo3d_camera / View3D.multiview_eye / ImageUser.multiview_eye */
 typedef enum eStereoViews {
-	STEREO_LEFT_ID = 0,
-	STEREO_RIGHT_ID = 1,
-	STEREO_3D_ID = 2,
-	STEREO_MONO_ID = 3,
+  STEREO_LEFT_ID = 0,
+  STEREO_RIGHT_ID = 1,
+  STEREO_3D_ID = 2,
+  STEREO_MONO_ID = 3,
 } eStereoViews;
 
 /* *************************************************************** */
 /* Markers */
 
 typedef struct TimeMarker {
-	struct TimeMarker *next, *prev;
-	int frame;
-	char name[64];
-	unsigned int flag;
-	struct Object *camera;
+  struct TimeMarker *next, *prev;
+  int frame;
+  char name[64];
+  unsigned int flag;
+  struct Object *camera;
 } TimeMarker;
 
 /* *************************************************************** */
@@ -849,49 +843,49 @@ typedef struct TimeMarker {
 #define PAINT_MAX_INPUT_SAMPLES 64
 
 typedef struct Paint_Runtime {
-	/* Avoid having to compare with scene pointer everywhere. */
-	unsigned int tool_offset;
-	unsigned short ob_mode;
-	char _pad[2];
+  /* Avoid having to compare with scene pointer everywhere. */
+  unsigned int tool_offset;
+  unsigned short ob_mode;
+  char _pad[2];
 } Paint_Runtime;
 
 /* We might want to store other things here. */
 typedef struct PaintToolSlot {
-	struct Brush *brush;
+  struct Brush *brush;
 } PaintToolSlot;
 
 /* Paint Tool Base */
 typedef struct Paint {
-	struct Brush *brush;
+  struct Brush *brush;
 
-	/* Each tool has it's own active brush,
-	 * The currently active tool is defined by the current 'brush'. */
-	struct PaintToolSlot *tool_slots;
-	int                   tool_slots_len;
-	char _pad1[4];
+  /* Each tool has it's own active brush,
+   * The currently active tool is defined by the current 'brush'. */
+  struct PaintToolSlot *tool_slots;
+  int tool_slots_len;
+  char _pad1[4];
 
-	struct Palette *palette;
-	/** Cavity curve. */
-	struct CurveMapping *cavity_curve;
+  struct Palette *palette;
+  /** Cavity curve. */
+  struct CurveMapping *cavity_curve;
 
-	/* WM Paint cursor */
-	void *paint_cursor;
-	unsigned char paint_cursor_col[4];
+  /* WM Paint cursor */
+  void *paint_cursor;
+  unsigned char paint_cursor_col[4];
 
-	/* enum ePaintFlags */
-	int flags;
+  /* enum ePaintFlags */
+  int flags;
 
-	/* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to
-	 * smooth the stroke */
-	int num_input_samples;
+  /* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to
+   * smooth the stroke */
+  int num_input_samples;
 
-	/* flags used for symmetry */
-	int symmetry_flags;
+  /* flags used for symmetry */
+  int symmetry_flags;
 
-	float tile_offset[3];
-	char _pad2[4];
+  float tile_offset[3];
+  char _pad2[4];
 
-	struct Paint_Runtime runtime;
+  struct Paint_Runtime runtime;
 } Paint;
 
 /* ------------------------------------------- */
@@ -899,32 +893,32 @@ typedef struct Paint {
 
 /* Texture/Image Editor */
 typedef struct ImagePaintSettings {
-	Paint paint;
-
-	short flag, missing_data;
-
-	/* for projection painting only */
-	short seam_bleed, normal_angle;
-	/** Capture size for re-projection. */
-	short screen_grab_size[2];
-
-	/** Mode used for texture painting. */
-	int mode;
-
-	/** Wm handle. */
-	void *paintcursor;
-	/** Workaround until we support true layer masks. */
-	struct Image *stencil;
-	/** Clone layer for image mode for projective texture painting. */
-	struct Image *clone;
-	/** Canvas when the explicit system is used for painting. */
-	struct Image *canvas;
-	float stencil_col[3];
-	/** Dither amount used when painting on byte images. */
-	float dither;
-	/** Display texture interpolation method. */
-	int interp;
-	char _pad[4];
+  Paint paint;
+
+  short flag, missing_data;
+
+  /* for projection painting only */
+  short seam_bleed, normal_angle;
+  /** Capture size for re-projection. */
+  short screen_grab_size[2];
+
+  /** Mode used for texture painting. */
+  int mode;
+
+  /** Wm handle. */
+  void *paintcursor;
+  /** Workaround until we support true layer masks. */
+  struct Image *stencil;
+  /** Clone layer for image mode for projective texture painting. */
+  struct Image *clone;
+  /** Canvas when the explicit system is used for painting. */
+  struct Image *canvas;
+  float stencil_col[3];
+  /** Dither amount used when painting on byte images. */
+  float dither;
+  /** Display texture interpolation method. */
+  int interp;
+  char _pad[4];
 } ImagePaintSettings;
 
 /* ------------------------------------------- */
@@ -932,35 +926,35 @@ typedef struct ImagePaintSettings {
 
 /* Settings for a Particle Editing Brush */
 typedef struct ParticleBrushData {
-	/** Common setting. */
-	short size;
-	/** For specific brushes only. */
-	short step, invert, count;
-	int flag;
-	float strength;
+  /** Common setting. */
+  short size;
+  /** For specific brushes only. */
+  short step, invert, count;
+  int flag;
+  float strength;
 } ParticleBrushData;
 
 /* Particle Edit Mode Settings */
 typedef struct ParticleEditSettings {
-	short flag;
-	short totrekey;
-	short totaddkey;
-	short brushtype;
+  short flag;
+  short totrekey;
+  short totaddkey;
+  short brushtype;
 
-	ParticleBrushData brush[7];
-	/** Runtime. */
-	void *paintcursor;
+  ParticleBrushData brush[7];
+  /** Runtime. */
+  void *paintcursor;
 
-	float emitterdist, rt;
+  float emitterdist, rt;
 
-	int selectmode;
-	int edittype;
+  int selectmode;
+  int edittype;
 
-	int draw_step, fade_frames;
+  int draw_step, fade_frames;
 
-	struct Scene *scene;
-	struct Object *object;
-	struct Object *shape_object;
+  struct Scene *scene;
+  struct Object *object;
+  struct Object *shape_object;
 } ParticleEditSettings;
 
 /* ------------------------------------------- */
@@ -968,41 +962,41 @@ typedef struct ParticleEditSettings {
 
 /* Sculpt */
 typedef struct Sculpt {
-	Paint paint;
+  Paint paint;
 
-	/* For rotating around a pivot point */
-	//float pivot[3]; XXX not used?
-	int flags;
+  /* For rotating around a pivot point */
+  //float pivot[3]; XXX not used?
+  int flags;
 
-	/* Control tablet input */
-	//char tablet_size, tablet_strength; XXX not used?
-	int radial_symm[3];
+  /* Control tablet input */
+  //char tablet_size, tablet_strength; XXX not used?
+  int radial_symm[3];
 
-	/* Maximum edge length for dynamic topology sculpting (in pixels) */
-	float detail_size;
+  /* Maximum edge length for dynamic topology sculpting (in pixels) */
+  float detail_size;
 
-	/* Direction used for SCULPT_OT_symmetrize operator */
-	int symmetrize_direction;
+  /* Direction used for SCULPT_OT_symmetrize operator */
+  int symmetrize_direction;
 
-	/* gravity factor for sculpting */
-	float gravity_factor;
+  /* gravity factor for sculpting */
+  float gravity_factor;
 
-	/* scale for constant detail size */
-	/** Constant detail resolution (Blender unit / constant_detail). */
-	float constant_detail;
-	float detail_percent;
-	char _pad[4];
+  /* scale for constant detail size */
+  /** Constant detail resolution (Blender unit / constant_detail). */
+  float constant_detail;
+  float detail_percent;
+  char _pad[4];
 
-	struct Object *gravity_object;
+  struct Object *gravity_object;
 } Sculpt;
 
 typedef struct UvSculpt {
-	Paint paint;
+  Paint paint;
 } UvSculpt;
 
 /* grease pencil drawing brushes */
 typedef struct GpPaint {
-	Paint paint;
+  Paint paint;
 } GpPaint;
 
 /* ------------------------------------------- */
@@ -1010,17 +1004,17 @@ typedef struct GpPaint {
 
 /* Vertex Paint */
 typedef struct VPaint {
-	Paint paint;
-	char flag;
-	char _pad[3];
-	/** For mirrored painting. */
-	int radial_symm[3];
+  Paint paint;
+  char flag;
+  char _pad[3];
+  /** For mirrored painting. */
+  int radial_symm[3];
 } VPaint;
 
 /* VPaint.flag */
 enum {
-	/* weight paint only */
-	VP_FLAG_VGROUP_RESTRICT     = (1 << 7),
+  /* weight paint only */
+  VP_FLAG_VGROUP_RESTRICT = (1 << 7),
 };
 
 /* ------------------------------------------- */
@@ -1028,181 +1022,181 @@ enum {
 
 /* GP_Sculpt_Settings.brushtype */
 typedef enum eGP_Sculpt_Types {
-	GP_SCULPT_TYPE_SMOOTH    = 0,
-	GP_SCULPT_TYPE_THICKNESS = 1,
-	GP_SCULPT_TYPE_STRENGTH  = 2,
-	GP_SCULPT_TYPE_GRAB      = 3,
-	GP_SCULPT_TYPE_PUSH      = 4,
-	GP_SCULPT_TYPE_TWIST     = 5,
-	GP_SCULPT_TYPE_PINCH     = 6,
-	GP_SCULPT_TYPE_RANDOMIZE = 7,
-	GP_SCULPT_TYPE_CLONE     = 8,
-	GP_SCULPT_TYPE_SUBDIVIDE = 9,
-	GP_SCULPT_TYPE_SIMPLIFY  = 10,
-	/* add any sculpt brush above this value */
-	GP_SCULPT_TYPE_WEIGHT    = 11,
-	/* add any weight paint brush below this value. Do no mix brushes */
-
-	/* !!! Update GP_Sculpt_Data brush[###]; below !!! */
-	GP_SCULPT_TYPE_MAX,
+  GP_SCULPT_TYPE_SMOOTH = 0,
+  GP_SCULPT_TYPE_THICKNESS = 1,
+  GP_SCULPT_TYPE_STRENGTH = 2,
+  GP_SCULPT_TYPE_GRAB = 3,
+  GP_SCULPT_TYPE_PUSH = 4,
+  GP_SCULPT_TYPE_TWIST = 5,
+  GP_SCULPT_TYPE_PINCH = 6,
+  GP_SCULPT_TYPE_RANDOMIZE = 7,
+  GP_SCULPT_TYPE_CLONE = 8,
+  GP_SCULPT_TYPE_SUBDIVIDE = 9,
+  GP_SCULPT_TYPE_SIMPLIFY = 10,
+  /* add any sculpt brush above this value */
+  GP_SCULPT_TYPE_WEIGHT = 11,
+  /* add any weight paint brush below this value. Do no mix brushes */
+
+  /* !!! Update GP_Sculpt_Data brush[###]; below !!! */
+  GP_SCULPT_TYPE_MAX,
 } eGP_Sculpt_Types;
 
 /* GP_Sculpt_Settings.lock_axis */
 typedef enum eGP_Lockaxis_Types {
-	GP_LOCKAXIS_VIEW = 0,
-	GP_LOCKAXIS_X = 1,
-	GP_LOCKAXIS_Y = 2,
-	GP_LOCKAXIS_Z = 3,
-	GP_LOCKAXIS_CURSOR = 4,
+  GP_LOCKAXIS_VIEW = 0,
+  GP_LOCKAXIS_X = 1,
+  GP_LOCKAXIS_Y = 2,
+  GP_LOCKAXIS_Z = 3,
+  GP_LOCKAXIS_CURSOR = 4,
 } eGP_Lockaxis_Types;
 
 /* Settings for a GPencil Stroke Sculpting Brush */
 typedef struct GP_Sculpt_Data {
-	/** Radius of brush. */
-	short size;
-	/** EGP_Sculpt_Flag. */
-	short flag;
-	/** Strength of effect. */
-	float strength;
-	/** Cursor color for add. */
-	float curcolor_add[3];
-	/** Cursor color for sub. */
-	float curcolor_sub[3];
-	/** Target weight. */
-	float weight;
-	char _pad[4];
+  /** Radius of brush. */
+  short size;
+  /** EGP_Sculpt_Flag. */
+  short flag;
+  /** Strength of effect. */
+  float strength;
+  /** Cursor color for add. */
+  float curcolor_add[3];
+  /** Cursor color for sub. */
+  float curcolor_sub[3];
+  /** Target weight. */
+  float weight;
+  char _pad[4];
 } GP_Sculpt_Data;
 
 /* Settings for a GPencil Speed Guide */
 typedef struct GP_Sculpt_Guide {
-	char use_guide;
-	char use_snapping;
-	char reference_point;
-	char type;
-	char _pad2[4];
-	float angle;
-	float angle_snap;
-	float spacing;
-	float location[3];
-	struct Object *reference_object;
+  char use_guide;
+  char use_snapping;
+  char reference_point;
+  char type;
+  char _pad2[4];
+  float angle;
+  float angle_snap;
+  float spacing;
+  float location[3];
+  struct Object *reference_object;
 } GP_Sculpt_Guide;
 
 /* GP_Sculpt_Data.flag */
 typedef enum eGP_Sculpt_Flag {
-	/* invert the effect of the brush */
-	GP_SCULPT_FLAG_INVERT       = (1 << 0),
-	/* adjust strength using pen pressure */
-	GP_SCULPT_FLAG_USE_PRESSURE = (1 << 1),
-
-	/* strength of brush falls off with distance from cursor */
-	GP_SCULPT_FLAG_USE_FALLOFF  = (1 << 2),
-
-	/* smooth brush affects pressure values as well */
-	GP_SCULPT_FLAG_SMOOTH_PRESSURE  = (1 << 3),
-	/* enable screen cursor */
-	GP_SCULPT_FLAG_ENABLE_CURSOR = (1 << 4),
-	/* temporary invert action */
-	GP_SCULPT_FLAG_TMP_INVERT = (1 << 5),
-	/* adjust radius using pen pressure */
-	GP_SCULPT_FLAG_PRESSURE_RADIUS = (1 << 6),
+  /* invert the effect of the brush */
+  GP_SCULPT_FLAG_INVERT = (1 << 0),
+  /* adjust strength using pen pressure */
+  GP_SCULPT_FLAG_USE_PRESSURE = (1 << 1),
+
+  /* strength of brush falls off with distance from cursor */
+  GP_SCULPT_FLAG_USE_FALLOFF = (1 << 2),
+
+  /* smooth brush affects pressure values as well */
+  GP_SCULPT_FLAG_SMOOTH_PRESSURE = (1 << 3),
+  /* enable screen cursor */
+  GP_SCULPT_FLAG_ENABLE_CURSOR = (1 << 4),
+  /* temporary invert action */
+  GP_SCULPT_FLAG_TMP_INVERT = (1 << 5),
+  /* adjust radius using pen pressure */
+  GP_SCULPT_FLAG_PRESSURE_RADIUS = (1 << 6),
 } eGP_Sculpt_Flag;
 
 /* GPencil Stroke Sculpting Settings */
 typedef struct GP_Sculpt_Settings {
-	/** GP_SCULPT_TYPE_MAX. */
-	GP_Sculpt_Data brush[12];
-	/** Runtime. */
-	void *paintcursor;
-
-	/** #eGP_Sculpt_Types (sculpt). */
-	int brushtype;
-	/** #eGP_Sculpt_SettingsFlag. */
-	int flag;
-	/** #eGP_Lockaxis_Types lock drawing to one axis. */
-	int lock_axis;
-	/** Threshold for intersections */
-	float isect_threshold;
-
-	/* weight paint is a submode of sculpt but use its own index. All weight paint
-	 * brushes must be defined at the end of the brush array.
-	 */
-	/** #eGP_Sculpt_Types (weight paint). */
-	int weighttype;
-	char _pad[4];
-	/** Multiframe edit falloff effect by frame. */
-	struct CurveMapping *cur_falloff;
-	/** Curve used for primitve tools. */
-	struct CurveMapping *cur_primitive;
-	/** Guides used for paint tools */
-	struct GP_Sculpt_Guide guide;
+  /** GP_SCULPT_TYPE_MAX. */
+  GP_Sculpt_Data brush[12];
+  /** Runtime. */
+  void *paintcursor;
+
+  /** #eGP_Sculpt_Types (sculpt). */
+  int brushtype;
+  /** #eGP_Sculpt_SettingsFlag. */
+  int flag;
+  /** #eGP_Lockaxis_Types lock drawing to one axis. */
+  int lock_axis;
+  /** Threshold for intersections */
+  float isect_threshold;
+
+  /* weight paint is a submode of sculpt but use its own index. All weight paint
+   * brushes must be defined at the end of the brush array.
+   */
+  /** #eGP_Sculpt_Types (weight paint). */
+  int weighttype;
+  char _pad[4];
+  /** Multiframe edit falloff effect by frame. */
+  struct CurveMapping *cur_falloff;
+  /** Curve used for primitve tools. */
+  struct CurveMapping *cur_primitive;
+  /** Guides used for paint tools */
+  struct GP_Sculpt_Guide guide;
 } GP_Sculpt_Settings;
 
 /* GP_Sculpt_Settings.flag */
 typedef enum eGP_Sculpt_SettingsFlag {
-	/* only affect selected points */
-	GP_SCULPT_SETT_FLAG_SELECT_MASK = (1 << 0),
-	/* apply brush to position */
-	GP_SCULPT_SETT_FLAG_APPLY_POSITION = (1 << 1),
-	/* apply brush to strength */
-	GP_SCULPT_SETT_FLAG_APPLY_STRENGTH = (1 << 2),
-	/* apply brush to thickness */
-	GP_SCULPT_SETT_FLAG_APPLY_THICKNESS = (1 << 3),
-	/* apply brush to thickness */
-	GP_SCULPT_SETT_FLAG_WEIGHT_MODE = (1 << 4),
-	/* enable falloff for multiframe editing */
-	GP_SCULPT_SETT_FLAG_FRAME_FALLOFF = (1 << 5),
-	/* apply brush to uv data */
-	GP_SCULPT_SETT_FLAG_APPLY_UV = (1 << 6),
-	/* apply primitve curve */
-	GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE = (1 << 7),
+  /* only affect selected points */
+  GP_SCULPT_SETT_FLAG_SELECT_MASK = (1 << 0),
+  /* apply brush to position */
+  GP_SCULPT_SETT_FLAG_APPLY_POSITION = (1 << 1),
+  /* apply brush to strength */
+  GP_SCULPT_SETT_FLAG_APPLY_STRENGTH = (1 << 2),
+  /* apply brush to thickness */
+  GP_SCULPT_SETT_FLAG_APPLY_THICKNESS = (1 << 3),
+  /* apply brush to thickness */
+  GP_SCULPT_SETT_FLAG_WEIGHT_MODE = (1 << 4),
+  /* enable falloff for multiframe editing */
+  GP_SCULPT_SETT_FLAG_FRAME_FALLOFF = (1 << 5),
+  /* apply brush to uv data */
+  GP_SCULPT_SETT_FLAG_APPLY_UV = (1 << 6),
+  /* apply primitve curve */
+  GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE = (1 << 7),
 } eGP_Sculpt_SettingsFlag;
 
 /* Settings for GP Interpolation Operators */
 typedef struct GP_Interpolate_Settings {
-	/** #eGP_Interpolate_SettingsFlag. */
-	short flag;
+  /** #eGP_Interpolate_SettingsFlag. */
+  short flag;
 
-	/** #eGP_Interpolate_Type - Interpolation Mode. */
-	char type;
-	/** #eBezTriple_Easing - Easing mode (if easing equation used). */
-	char easing;
+  /** #eGP_Interpolate_Type - Interpolation Mode. */
+  char type;
+  /** #eBezTriple_Easing - Easing mode (if easing equation used). */
+  char easing;
 
-	/** BEZT_IPO_BACK. */
-	float back;
-	/** BEZT_IPO_ELASTIC. */
-	float amplitude, period;
+  /** BEZT_IPO_BACK. */
+  float back;
+  /** BEZT_IPO_ELASTIC. */
+  float amplitude, period;
 
-	/** Custom interpolation curve (for use with GP_IPO_CURVEMAP). */
-	struct CurveMapping *custom_ipo;
+  /** Custom interpolation curve (for use with GP_IPO_CURVEMAP). */
+  struct CurveMapping *custom_ipo;
 } GP_Interpolate_Settings;
 
 /* GP_Interpolate_Settings.flag */
 typedef enum eGP_Interpolate_SettingsFlag {
-	/* apply interpolation to all layers */
-	GP_TOOLFLAG_INTERPOLATE_ALL_LAYERS    = (1 << 0),
-	/* apply interpolation to only selected */
-	GP_TOOLFLAG_INTERPOLATE_ONLY_SELECTED = (1 << 1),
+  /* apply interpolation to all layers */
+  GP_TOOLFLAG_INTERPOLATE_ALL_LAYERS = (1 << 0),
+  /* apply interpolation to only selected */
+  GP_TOOLFLAG_INTERPOLATE_ONLY_SELECTED = (1 << 1),
 } eGP_Interpolate_SettingsFlag;
 
 /* GP_Interpolate_Settings.type */
 typedef enum eGP_Interpolate_Type {
-	/* Traditional Linear Interpolation */
-	GP_IPO_LINEAR   = 0,
-
-	/* CurveMap Defined Interpolation */
-	GP_IPO_CURVEMAP = 1,
-
-	/* Easing Equations */
-	GP_IPO_BACK = 3,
-	GP_IPO_BOUNCE = 4,
-	GP_IPO_CIRC = 5,
-	GP_IPO_CUBIC = 6,
-	GP_IPO_ELASTIC = 7,
-	GP_IPO_EXPO = 8,
-	GP_IPO_QUAD = 9,
-	GP_IPO_QUART = 10,
-	GP_IPO_QUINT = 11,
-	GP_IPO_SINE = 12,
+  /* Traditional Linear Interpolation */
+  GP_IPO_LINEAR = 0,
+
+  /* CurveMap Defined Interpolation */
+  GP_IPO_CURVEMAP = 1,
+
+  /* Easing Equations */
+  GP_IPO_BACK = 3,
+  GP_IPO_BOUNCE = 4,
+  GP_IPO_CIRC = 5,
+  GP_IPO_CUBIC = 6,
+  GP_IPO_ELASTIC = 7,
+  GP_IPO_EXPO = 8,
+  GP_IPO_QUAD = 9,
+  GP_IPO_QUART = 10,
+  GP_IPO_QUINT = 11,
+  GP_IPO_SINE = 12,
 } eGP_Interpolate_Type;
 
 /* *************************************************************** */
@@ -1213,315 +1207,310 @@ typedef enum eGP_Interpolate_Type {
  * Brush for any paint mode; the flag field controls whether these
  * values are used */
 typedef struct UnifiedPaintSettings {
-	/* unified radius of brush in pixels */
-	int size;
-
-	/* unified radius of brush in Blender units */
-	float unprojected_radius;
+  /* unified radius of brush in pixels */
+  int size;
 
-	/* unified strength of brush */
-	float alpha;
+  /* unified radius of brush in Blender units */
+  float unprojected_radius;
 
-	/* unified brush weight, [0, 1] */
-	float weight;
+  /* unified strength of brush */
+  float alpha;
 
-	/* unified brush color */
-	float rgb[3];
-	/* unified brush secondary color */
-	float secondary_rgb[3];
+  /* unified brush weight, [0, 1] */
+  float weight;
 
-	/* user preferences for sculpt and paint */
-	int flag;
+  /* unified brush color */
+  float rgb[3];
+  /* unified brush secondary color */
+  float secondary_rgb[3];
 
-	/* rake rotation */
+  /* user preferences for sculpt and paint */
+  int flag;
 
-	/* record movement of mouse so that rake can start at an intuitive angle */
-	float last_rake[2];
-	float last_rake_angle;
+  /* rake rotation */
 
-	int last_stroke_valid;
-	float average_stroke_accum[3];
-	int average_stroke_counter;
+  /* record movement of mouse so that rake can start at an intuitive angle */
+  float last_rake[2];
+  float last_rake_angle;
 
+  int last_stroke_valid;
+  float average_stroke_accum[3];
+  int average_stroke_counter;
 
-	float brush_rotation;
-	float brush_rotation_sec;
+  float brush_rotation;
+  float brush_rotation_sec;
 
-	/*******************************************************************************
-	 * all data below are used to communicate with cursor drawing and tex sampling *
-	 *******************************************************************************/
-	int anchored_size;
+  /*******************************************************************************
+   * all data below are used to communicate with cursor drawing and tex sampling *
+   *******************************************************************************/
+  int anchored_size;
 
-	/**
-	 * Normalization factor due to accumulated value of curve along spacing.
-	 * Calculated when brush spacing changes to dampen strength of stroke
-	 * if space attenuation is used.
-	 */
-	float overlap_factor;
-	char draw_inverted;
-	/* check is there an ongoing stroke right now */
-	char stroke_active;
+  /**
+   * Normalization factor due to accumulated value of curve along spacing.
+   * Calculated when brush spacing changes to dampen strength of stroke
+   * if space attenuation is used.
+   */
+  float overlap_factor;
+  char draw_inverted;
+  /* check is there an ongoing stroke right now */
+  char stroke_active;
 
-	char draw_anchored;
-	char do_linear_conversion;
+  char draw_anchored;
+  char do_linear_conversion;
 
-	/* store last location of stroke or whether the mesh was hit.
-	 * Valid only while stroke is active */
-	float last_location[3];
-	int last_hit;
+  /* store last location of stroke or whether the mesh was hit.
+   * Valid only while stroke is active */
+  float last_location[3];
+  int last_hit;
 
-	float anchored_initial_mouse[2];
+  float anchored_initial_mouse[2];
 
-	/* radius of brush, premultiplied with pressure.
-	 * In case of anchored brushes contains the anchored radius */
-	float pixel_radius;
+  /* radius of brush, premultiplied with pressure.
+   * In case of anchored brushes contains the anchored radius */
+  float pixel_radius;
 
-	/* drawing pressure */
-	float size_pressure_value;
+  /* drawing pressure */
+  float size_pressure_value;
 
-	/* position of mouse, used to sample the texture */
-	float tex_mouse[2];
+  /* position of mouse, used to sample the texture */
+  float tex_mouse[2];
 
-	/* position of mouse, used to sample the mask texture */
-	float mask_tex_mouse[2];
+  /* position of mouse, used to sample the mask texture */
+  float mask_tex_mouse[2];
 
-	/* ColorSpace cache to avoid locking up during sampling */
-	struct ColorSpace *colorspace;
+  /* ColorSpace cache to avoid locking up during sampling */
+  struct ColorSpace *colorspace;
 } UnifiedPaintSettings;
 
 /* UnifiedPaintSettings.flag */
 typedef enum {
-	UNIFIED_PAINT_SIZE  = (1 << 0),
-	UNIFIED_PAINT_ALPHA = (1 << 1),
-	UNIFIED_PAINT_WEIGHT = (1 << 5),
-	UNIFIED_PAINT_COLOR = (1 << 6),
-
-	/* only used if unified size is enabled, mirrors the brush flags
-	 * BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */
-	UNIFIED_PAINT_BRUSH_LOCK_SIZE = (1 << 2),
-	UNIFIED_PAINT_BRUSH_SIZE_PRESSURE   = (1 << 3),
-
-	/* only used if unified alpha is enabled, mirrors the brush flag
-	 * BRUSH_ALPHA_PRESSURE */
-	UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE  = (1 << 4),
+  UNIFIED_PAINT_SIZE = (1 << 0),
+  UNIFIED_PAINT_ALPHA = (1 << 1),
+  UNIFIED_PAINT_WEIGHT = (1 << 5),
+  UNIFIED_PAINT_COLOR = (1 << 6),
+
+  /* only used if unified size is enabled, mirrors the brush flags
+   * BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */
+  UNIFIED_PAINT_BRUSH_LOCK_SIZE = (1 << 2),
+  UNIFIED_PAINT_BRUSH_SIZE_PRESSURE = (1 << 3),
+
+  /* only used if unified alpha is enabled, mirrors the brush flag
+   * BRUSH_ALPHA_PRESSURE */
+  UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1 << 4),
 } eUnifiedPaintSettingsFlags;
 
-
 typedef struct CurvePaintSettings {
-	char curve_type;
-	char flag;
-	char depth_mode;
-	char surface_plane;
-	char fit_method;
-	char _pad;
-	short error_threshold;
-	float radius_min, radius_max;
-	float radius_taper_start, radius_taper_end;
-	float surface_offset;
-	float corner_angle;
+  char curve_type;
+  char flag;
+  char depth_mode;
+  char surface_plane;
+  char fit_method;
+  char _pad;
+  short error_threshold;
+  float radius_min, radius_max;
+  float radius_taper_start, radius_taper_end;
+  float surface_offset;
+  float corner_angle;
 } CurvePaintSettings;
 
 /* CurvePaintSettings.flag */
 enum {
-	CURVE_PAINT_FLAG_CORNERS_DETECT             = (1 << 0),
-	CURVE_PAINT_FLAG_PRESSURE_RADIUS            = (1 << 1),
-	CURVE_PAINT_FLAG_DEPTH_STROKE_ENDPOINTS     = (1 << 2),
-	CURVE_PAINT_FLAG_DEPTH_STROKE_OFFSET_ABS    = (1 << 3),
+  CURVE_PAINT_FLAG_CORNERS_DETECT = (1 << 0),
+  CURVE_PAINT_FLAG_PRESSURE_RADIUS = (1 << 1),
+  CURVE_PAINT_FLAG_DEPTH_STROKE_ENDPOINTS = (1 << 2),
+  CURVE_PAINT_FLAG_DEPTH_STROKE_OFFSET_ABS = (1 << 3),
 };
 
 /* CurvePaintSettings.fit_method */
 enum {
-	CURVE_PAINT_FIT_METHOD_REFIT            = 0,
-	CURVE_PAINT_FIT_METHOD_SPLIT            = 1,
+  CURVE_PAINT_FIT_METHOD_REFIT = 0,
+  CURVE_PAINT_FIT_METHOD_SPLIT = 1,
 };
 
 /* CurvePaintSettings.depth_mode */
 enum {
-	CURVE_PAINT_PROJECT_CURSOR              = 0,
-	CURVE_PAINT_PROJECT_SURFACE             = 1,
+  CURVE_PAINT_PROJECT_CURSOR = 0,
+  CURVE_PAINT_PROJECT_SURFACE = 1,
 };
 
 /* CurvePaintSettings.surface_plane */
 enum {
-	CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW           = 0,
-	CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE        = 1,
-	CURVE_PAINT_SURFACE_PLANE_VIEW                  = 2,
+  CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW = 0,
+  CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE = 1,
+  CURVE_PAINT_SURFACE_PLANE_VIEW = 2,
 };
 
-
 /* *************************************************************** */
 /* Stats */
 
 /* Stats for Meshes */
 typedef struct MeshStatVis {
-	char type;
-	char _pad1[2];
+  char type;
+  char _pad1[2];
 
-	/* overhang */
-	char  overhang_axis;
-	float overhang_min, overhang_max;
+  /* overhang */
+  char overhang_axis;
+  float overhang_min, overhang_max;
 
-	/* thickness */
-	float thickness_min, thickness_max;
-	char thickness_samples;
-	char _pad2[3];
+  /* thickness */
+  float thickness_min, thickness_max;
+  char thickness_samples;
+  char _pad2[3];
 
-	/* distort */
-	float distort_min, distort_max;
+  /* distort */
+  float distort_min, distort_max;
 
-	/* sharp */
-	float sharp_min, sharp_max;
+  /* sharp */
+  float sharp_min, sharp_max;
 } MeshStatVis;
 
-
 /* *************************************************************** */
 /* Tool Settings */
 
 typedef struct ToolSettings {
-	/** Vertex paint. */
-	VPaint *vpaint;
-	/** Weight paint. */
-	VPaint *wpaint;
-	Sculpt *sculpt;
-	/** Uv smooth. */
-	UvSculpt *uvsculpt;
-	/** Gpencil paint. */
-	GpPaint *gp_paint;
-
-	/* Vertex group weight - used only for editmode, not weight
-	 * paint */
-	float vgroup_weight;
-
-	/** Remove doubles limit. */
-	float doublimit;
-	char automerge;
-	char object_flag;
-
-	/* Selection Mode for Mesh */
-	short selectmode;
-
-	/* UV Calculation */
-	char unwrapper;
-	char uvcalc_flag;
-	char uv_flag;
-	char uv_selectmode;
-
-	float uvcalc_margin;
-
-	/* Auto-IK */
-	/** Runtime only. */
-	short autoik_chainlen;
-
-	/* Grease Pencil */
-	/** Flags/options for how the tool works. */
-	char gpencil_flags;
-
-	/** Stroke placement settings: 3D View. */
-	char gpencil_v3d_align;
-	/** General 2D Editor. */
-	char gpencil_v2d_align;
-	/** Sequencer Preview. */
-	char gpencil_seq_align;
-	/** Image Editor. */
-	char gpencil_ima_align;
-
-	/* Annotations */
-	/** Stroke placement settings - 3D View. */
-	char annotate_v3d_align;
-
-	/** Default stroke thickness for annotation strokes. */
-	short annotate_thickness;
-	/** Stroke selection mode. */
-	short gpencil_selectmode;
-
-	/* Grease Pencil Sculpt */
-	struct GP_Sculpt_Settings gp_sculpt;
-
-	/* Grease Pencil Interpolation Tool(s) */
-	struct GP_Interpolate_Settings gp_interpolate;
-
-	/* Image Paint (8 bytes aligned please!) */
-	struct ImagePaintSettings imapaint;
-
-	/* Particle Editing */
-	struct ParticleEditSettings particle;
-
-	/* Transform Proportional Area of Effect */
-	float proportional_size;
-
-	/* Select Group Threshold */
-	float select_thresh;
-
-	/* Auto-Keying Mode */
-	/** Defines in DNA_userdef_types.h. */
-	short autokey_flag;
-	char  autokey_mode;
-	/** Keyframe type (see DNA_curve_types.h). */
-	char keyframe_type;
-
-	/* Multires */
-	char multires_subdiv_type;
-
-	/* Alt+RMB option */
-	char edge_mode;
-	char edge_mode_live_unwrap;
-
-	char _pad1[1];
-
-	/* Transform */
-	char transform_pivot_point;
-	char transform_flag;
-	char snap_mode, snap_node_mode;
-	char snap_uv_mode;
-	char snap_flag;
-	char snap_target;
-	char snap_transform_mode_flag;
-
-
-	char proportional, prop_mode;
-	/** Proportional edit, object mode. */
-	char proportional_objects;
-	/** Proportional edit, mask editing. */
-	char proportional_mask;
-	/** Proportional edit, action editor. */
-	char proportional_action;
-	/** Proportional edit, graph editor. */
-	char proportional_fcurve;
-	/** Lock marker editing. */
-	char lock_markers;
-
-	/**aUto normalizing mode in wpain.t*/
-	char auto_normalize;
-	/** Paint multiple bones in wpaint. */
-	char multipaint;
-	char weightuser;
-	/** Subset selection filter in wpaint. */
-	char vgroupsubset;
-
-	/* UV painting */
-	char _pad2[1];
-	char use_uv_sculpt;
-	char uv_sculpt_settings;
-	char uv_sculpt_tool;
-	char uv_relax_method;
-	/* XXX: these sculpt_paint_* fields are deprecated, use the
-	 * unified_paint_settings field instead! */
-	short sculpt_paint_settings DNA_DEPRECATED;
-	char _pad5[2];
-	int sculpt_paint_unified_size DNA_DEPRECATED;
-	float sculpt_paint_unified_unprojected_radius DNA_DEPRECATED;
-	float sculpt_paint_unified_alpha DNA_DEPRECATED;
-
-	/* Unified Paint Settings */
-	struct UnifiedPaintSettings unified_paint_settings;
-
-	struct CurvePaintSettings curve_paint_settings;
-
-	struct MeshStatVis statvis;
-
-	/* Normal Editing */
-	float normal_vector[3];
-	int face_strength;
+  /** Vertex paint. */
+  VPaint *vpaint;
+  /** Weight paint. */
+  VPaint *wpaint;
+  Sculpt *sculpt;
+  /** Uv smooth. */
+  UvSculpt *uvsculpt;
+  /** Gpencil paint. */
+  GpPaint *gp_paint;
+
+  /* Vertex group weight - used only for editmode, not weight
+   * paint */
+  float vgroup_weight;
+
+  /** Remove doubles limit. */
+  float doublimit;
+  char automerge;
+  char object_flag;
+
+  /* Selection Mode for Mesh */
+  short selectmode;
+
+  /* UV Calculation */
+  char unwrapper;
+  char uvcalc_flag;
+  char uv_flag;
+  char uv_selectmode;
+
+  float uvcalc_margin;
+
+  /* Auto-IK */
+  /** Runtime only. */
+  short autoik_chainlen;
+
+  /* Grease Pencil */
+  /** Flags/options for how the tool works. */
+  char gpencil_flags;
+
+  /** Stroke placement settings: 3D View. */
+  char gpencil_v3d_align;
+  /** General 2D Editor. */
+  char gpencil_v2d_align;
+  /** Sequencer Preview. */
+  char gpencil_seq_align;
+  /** Image Editor. */
+  char gpencil_ima_align;
+
+  /* Annotations */
+  /** Stroke placement settings - 3D View. */
+  char annotate_v3d_align;
+
+  /** Default stroke thickness for annotation strokes. */
+  short annotate_thickness;
+  /** Stroke selection mode. */
+  short gpencil_selectmode;
+
+  /* Grease Pencil Sculpt */
+  struct GP_Sculpt_Settings gp_sculpt;
+
+  /* Grease Pencil Interpolation Tool(s) */
+  struct GP_Interpolate_Settings gp_interpolate;
+
+  /* Image Paint (8 bytes aligned please!) */
+  struct ImagePaintSettings imapaint;
+
+  /* Particle Editing */
+  struct ParticleEditSettings particle;
+
+  /* Transform Proportional Area of Effect */
+  float proportional_size;
+
+  /* Select Group Threshold */
+  float select_thresh;
+
+  /* Auto-Keying Mode */
+  /** Defines in DNA_userdef_types.h. */
+  short autokey_flag;
+  char autokey_mode;
+  /** Keyframe type (see DNA_curve_types.h). */
+  char keyframe_type;
+
+  /* Multires */
+  char multires_subdiv_type;
+
+  /* Alt+RMB option */
+  char edge_mode;
+  char edge_mode_live_unwrap;
+
+  char _pad1[1];
+
+  /* Transform */
+  char transform_pivot_point;
+  char transform_flag;
+  char snap_mode, snap_node_mode;
+  char snap_uv_mode;
+  char snap_flag;
+  char snap_target;
+  char snap_transform_mode_flag;
+
+  char proportional, prop_mode;
+  /** Proportional edit, object mode. */
+  char proportional_objects;
+  /** Proportional edit, mask editing. */
+  char proportional_mask;
+  /** Proportional edit, action editor. */
+  char proportional_action;
+  /** Proportional edit, graph editor. */
+  char proportional_fcurve;
+  /** Lock marker editing. */
+  char lock_markers;
+
+  /**aUto normalizing mode in wpain.t*/
+  char auto_normalize;
+  /** Paint multiple bones in wpaint. */
+  char multipaint;
+  char weightuser;
+  /** Subset selection filter in wpaint. */
+  char vgroupsubset;
+
+  /* UV painting */
+  char _pad2[1];
+  char use_uv_sculpt;
+  char uv_sculpt_settings;
+  char uv_sculpt_tool;
+  char uv_relax_method;
+  /* XXX: these sculpt_paint_* fields are deprecated, use the
+   * unified_paint_settings field instead! */
+  short sculpt_paint_settings DNA_DEPRECATED;
+  char _pad5[2];
+  int sculpt_paint_unified_size DNA_DEPRECATED;
+  float sculpt_paint_unified_unprojected_radius DNA_DEPRECATED;
+  float sculpt_paint_unified_alpha DNA_DEPRECATED;
+
+  /* Unified Paint Settings */
+  struct UnifiedPaintSettings unified_paint_settings;
+
+  struct CurvePaintSettings curve_paint_settings;
+
+  struct MeshStatVis statvis;
+
+  /* Normal Editing */
+  float normal_vector[3];
+  int face_strength;
 } ToolSettings;
 
 /* *************************************************************** */
@@ -1531,417 +1520,420 @@ typedef struct ToolSettings {
 /* Unit Settings */
 
 typedef struct UnitSettings {
-	/* Display/Editing unit options for each scene */
-	/** Maybe have other unit conversions?. */
-	float scale_length;
-	/** Imperial, metric etc. */
-	char system;
-	/** Not implemented as a proper unit system yet. */
-	char system_rotation;
-	short flag;
-
-	char length_unit;
-	char mass_unit;
-	char time_unit;
-
-	char _pad[5];
+  /* Display/Editing unit options for each scene */
+  /** Maybe have other unit conversions?. */
+  float scale_length;
+  /** Imperial, metric etc. */
+  char system;
+  /** Not implemented as a proper unit system yet. */
+  char system_rotation;
+  short flag;
+
+  char length_unit;
+  char mass_unit;
+  char time_unit;
+
+  char _pad[5];
 } UnitSettings;
 
 /* ------------------------------------------- */
 /* Global/Common Physics Settings */
 
 typedef struct PhysicsSettings {
-	float gravity[3];
-	int flag, quick_cache_step, rt;
+  float gravity[3];
+  int flag, quick_cache_step, rt;
 } PhysicsSettings;
 
 /* ------------------------------------------- */
 /* Safe Area options used in Camera View & Sequencer
  */
 typedef struct DisplaySafeAreas {
-	/* each value represents the (x,y) margins as a multiplier.
-	 * 'center' in this context is just the name for a different kind of safe-area */
+  /* each value represents the (x,y) margins as a multiplier.
+   * 'center' in this context is just the name for a different kind of safe-area */
 
-	/** Title Safe. */
-	float title[2];
-	/** Image/Graphics Safe. */
-	float action[2];
+  /** Title Safe. */
+  float title[2];
+  /** Image/Graphics Safe. */
+  float action[2];
 
-	/* use for alternate aspect ratio */
-	float title_center[2];
-	float action_center[2];
+  /* use for alternate aspect ratio */
+  float title_center[2];
+  float action_center[2];
 } DisplaySafeAreas;
 
 /* ------------------------------------------- */
 /* Scene Display - used for store scene specific display settings for the 3d view */
 typedef struct SceneDisplay {
-	/** Light direction for shadows/highlight. */
-	float light_direction[3];
-	float shadow_shift, shadow_focus;
+  /** Light direction for shadows/highlight. */
+  float light_direction[3];
+  float shadow_shift, shadow_focus;
 
-	/** Settings for Cavity Shader. */
-	float matcap_ssao_distance;
-	float matcap_ssao_attenuation;
-	int matcap_ssao_samples;
+  /** Settings for Cavity Shader. */
+  float matcap_ssao_distance;
+  float matcap_ssao_attenuation;
+  int matcap_ssao_samples;
 
-	/** OpenGL render engine settings. */
-	View3DShading shading;
+  /** OpenGL render engine settings. */
+  View3DShading shading;
 } SceneDisplay;
 
 typedef struct SceneEEVEE {
-	int flag;
-	int gi_diffuse_bounces;
-	int gi_cubemap_resolution;
-	int gi_visibility_resolution;
-	float gi_irradiance_smoothing;
-	float gi_glossy_clamp;
-	float gi_filter_quality;
-	char _pad[4];
-
-	float gi_cubemap_draw_size;
-	float gi_irradiance_draw_size;
-
-	int taa_samples;
-	int taa_render_samples;
-	int sss_samples;
-	float sss_jitter_threshold;
-
-	float ssr_quality;
-	float ssr_max_roughness;
-	float ssr_thickness;
-	float ssr_border_fade;
-	float ssr_firefly_fac;
-
-	float volumetric_start;
-	float volumetric_end;
-	int volumetric_tile_size;
-	int volumetric_samples;
-	float volumetric_sample_distribution;
-	float volumetric_light_clamp;
-	int volumetric_shadow_samples;
-
-	float gtao_distance;
-	float gtao_factor;
-	float gtao_quality;
-
-	float bokeh_max_size;
-	float bokeh_threshold;
-
-	float bloom_color[3];
-	float bloom_threshold;
-	float bloom_knee;
-	float bloom_intensity;
-	float bloom_radius;
-	float bloom_clamp;
-
-	int motion_blur_samples;
-	float motion_blur_shutter;
-
-	int shadow_method;
-	int shadow_cube_size;
-	int shadow_cascade_size;
-
-	struct LightCache *light_cache;
-	char light_cache_info[64];
-
-	float overscan;
-	float light_threshold;
+  int flag;
+  int gi_diffuse_bounces;
+  int gi_cubemap_resolution;
+  int gi_visibility_resolution;
+  float gi_irradiance_smoothing;
+  float gi_glossy_clamp;
+  float gi_filter_quality;
+  char _pad[4];
+
+  float gi_cubemap_draw_size;
+  float gi_irradiance_draw_size;
+
+  int taa_samples;
+  int taa_render_samples;
+  int sss_samples;
+  float sss_jitter_threshold;
+
+  float ssr_quality;
+  float ssr_max_roughness;
+  float ssr_thickness;
+  float ssr_border_fade;
+  float ssr_firefly_fac;
+
+  float volumetric_start;
+  float volumetric_end;
+  int volumetric_tile_size;
+  int volumetric_samples;
+  float volumetric_sample_distribution;
+  float volumetric_light_clamp;
+  int volumetric_shadow_samples;
+
+  float gtao_distance;
+  float gtao_factor;
+  float gtao_quality;
+
+  float bokeh_max_size;
+  float bokeh_threshold;
+
+  float bloom_color[3];
+  float bloom_threshold;
+  float bloom_knee;
+  float bloom_intensity;
+  float bloom_radius;
+  float bloom_clamp;
+
+  int motion_blur_samples;
+  float motion_blur_shutter;
+
+  int shadow_method;
+  int shadow_cube_size;
+  int shadow_cascade_size;
+
+  struct LightCache *light_cache;
+  char light_cache_info[64];
+
+  float overscan;
+  float light_threshold;
 } SceneEEVEE;
 
 /* *************************************************************** */
 /* Scene ID-Block */
 
 typedef struct TransformOrientationSlot {
-	int type;
-	int index_custom;
-	char flag;
-	char _pad0[7];
+  int type;
+  int index_custom;
+  char flag;
+  char _pad0[7];
 } TransformOrientationSlot;
 
 /* Indices when used in Scene.orientation. */
 enum {
-	SCE_ORIENT_DEFAULT = 0,
-	SCE_ORIENT_TRANSLATE = 1,
-	SCE_ORIENT_ROTATE = 2,
-	SCE_ORIENT_SCALE = 3,
+  SCE_ORIENT_DEFAULT = 0,
+  SCE_ORIENT_TRANSLATE = 1,
+  SCE_ORIENT_ROTATE = 2,
+  SCE_ORIENT_SCALE = 3,
 };
 
 typedef struct Scene {
-	ID id;
-	/** Animation data (must be immediately after id for utilities to use it). */
-	struct AnimData *adt;
+  ID id;
+  /** Animation data (must be immediately after id for utilities to use it). */
+  struct AnimData *adt;
 
-	struct Object *camera;
-	struct World *world;
+  struct Object *camera;
+  struct World *world;
 
-	struct Scene *set;
+  struct Scene *set;
 
-	ListBase base DNA_DEPRECATED;
-	/** Active base. */
-	struct Base  *basact DNA_DEPRECATED;
-	void *_pad1;
+  ListBase base DNA_DEPRECATED;
+  /** Active base. */
+  struct Base *basact DNA_DEPRECATED;
+  void *_pad1;
 
-	/** 3d cursor location. */
-	View3DCursor cursor;
+  /** 3d cursor location. */
+  View3DCursor cursor;
 
-	/** Bitflags for layer visibility (deprecated). */
-	unsigned int lay DNA_DEPRECATED;
-	/** Active layer (deprecated) */
-	int layact DNA_DEPRECATED;
-	char _pad2[4];
+  /** Bitflags for layer visibility (deprecated). */
+  unsigned int lay DNA_DEPRECATED;
+  /** Active layer (deprecated) */
+  int layact DNA_DEPRECATED;
+  char _pad2[4];
 
-	/** Various settings. */
-	short flag;
+  /** Various settings. */
+  short flag;
 
-	char use_nodes;
-	char _pad3[1];
+  char use_nodes;
+  char _pad3[1];
 
-	struct bNodeTree *nodetree;
+  struct bNodeTree *nodetree;
 
-	/** Sequence editor data is allocated here. */
-	struct Editing *ed;
+  /** Sequence editor data is allocated here. */
+  struct Editing *ed;
 
-	/** Default allocated now. */
-	struct ToolSettings *toolsettings;
-	void *_pad4;
-	struct DisplaySafeAreas safe_areas;
+  /** Default allocated now. */
+  struct ToolSettings *toolsettings;
+  void *_pad4;
+  struct DisplaySafeAreas safe_areas;
 
-	/* migrate or replace? depends on some internal things... */
-	/* no, is on the right place (ton) */
-	struct RenderData r;
-	struct AudioData audio;
+  /* migrate or replace? depends on some internal things... */
+  /* no, is on the right place (ton) */
+  struct RenderData r;
+  struct AudioData audio;
 
-	ListBase markers;
-	ListBase transform_spaces;
+  ListBase markers;
+  ListBase transform_spaces;
 
-	/** First is the [scene, translate, rotate, scale]. */
-	TransformOrientationSlot orientation_slots[4];
+  /** First is the [scene, translate, rotate, scale]. */
+  TransformOrientationSlot orientation_slots[4];
 
-	void *sound_scene;
-	void *playback_handle;
-	void *sound_scrub_handle;
-	void *speaker_handles;
+  void *sound_scene;
+  void *playback_handle;
+  void *sound_scrub_handle;
+  void *speaker_handles;
 
-	/** (runtime) info/cache used for presenting playback framerate info to the user. */
-	void *fps_info;
+  /** (runtime) info/cache used for presenting playback framerate info to the user. */
+  void *fps_info;
 
-	/* none of the dependency graph  vars is mean to be saved */
-	struct GHash *depsgraph_hash;
-	char _pad7[4];
+  /* none of the dependency graph  vars is mean to be saved */
+  struct GHash *depsgraph_hash;
+  char _pad7[4];
 
-	/* User-Defined KeyingSets */
-	/**
-	 * Index of the active KeyingSet.
-	 * first KeyingSet has index 1, 'none' active is 0, 'add new' is -1
-	 */
-	int active_keyingset;
-	/** KeyingSets for this scene */
-	ListBase keyingsets;
+  /* User-Defined KeyingSets */
+  /**
+   * Index of the active KeyingSet.
+   * first KeyingSet has index 1, 'none' active is 0, 'add new' is -1
+   */
+  int active_keyingset;
+  /** KeyingSets for this scene */
+  ListBase keyingsets;
 
-	/* Units */
-	struct UnitSettings unit;
+  /* Units */
+  struct UnitSettings unit;
 
-	/* Grease Pencil - Annotations */
-	struct bGPdata *gpd;
+  /* Grease Pencil - Annotations */
+  struct bGPdata *gpd;
 
-	/* Movie Tracking */
-	/** Active movie clip. */
-	struct MovieClip *clip;
+  /* Movie Tracking */
+  /** Active movie clip. */
+  struct MovieClip *clip;
 
-	/* Physics simulation settings */
-	struct PhysicsSettings physics_settings;
+  /* Physics simulation settings */
+  struct PhysicsSettings physics_settings;
 
-	void *_pad8;
-	/* XXX. runtime flag for drawing, actually belongs in the window,
-	 * only used by BKE_object_handle_update() */
-	struct CustomData_MeshMasks customdata_mask;
-	/* XXX. same as above but for temp operator use (gl renders) */
-	struct CustomData_MeshMasks customdata_mask_modal;
+  void *_pad8;
+  /* XXX. runtime flag for drawing, actually belongs in the window,
+   * only used by BKE_object_handle_update() */
+  struct CustomData_MeshMasks customdata_mask;
+  /* XXX. same as above but for temp operator use (gl renders) */
+  struct CustomData_MeshMasks customdata_mask_modal;
 
-	/* Color Management */
-	ColorManagedViewSettings view_settings;
-	ColorManagedDisplaySettings display_settings;
-	ColorManagedColorspaceSettings sequencer_colorspace_settings;
+  /* Color Management */
+  ColorManagedViewSettings view_settings;
+  ColorManagedDisplaySettings display_settings;
+  ColorManagedColorspaceSettings sequencer_colorspace_settings;
 
-	/* RigidBody simulation world+settings */
-	struct RigidBodyWorld *rigidbody_world;
+  /* RigidBody simulation world+settings */
+  struct RigidBodyWorld *rigidbody_world;
 
-	struct PreviewImage *preview;
+  struct PreviewImage *preview;
 
-	ListBase view_layers;
-	/* Not an actual datablock, but memory owned by scene. */
-	Collection *master_collection;
-	struct SceneCollection *collection DNA_DEPRECATED;
+  ListBase view_layers;
+  /* Not an actual datablock, but memory owned by scene. */
+  Collection *master_collection;
+  struct SceneCollection *collection DNA_DEPRECATED;
 
-	/** Settings to be override by workspaces. */
-	IDProperty *layer_properties;
+  /** Settings to be override by workspaces. */
+  IDProperty *layer_properties;
 
-	struct SceneDisplay display;
-	struct SceneEEVEE eevee;
+  struct SceneDisplay display;
+  struct SceneEEVEE eevee;
 } Scene;
 
 /* **************** RENDERDATA ********************* */
 
 /* RenderData.flag */
-	/* use preview range */
-#define SCER_PRV_RANGE	(1 << 0)
-#define SCER_LOCK_FRAME_SELECTION	(1 << 1)
-	/* show/use subframes (for checking motion blur) */
-#define SCER_SHOW_SUBFRAME	(1 << 3)
+/* use preview range */
+#define SCER_PRV_RANGE (1 << 0)
+#define SCER_LOCK_FRAME_SELECTION (1 << 1)
+/* show/use subframes (for checking motion blur) */
+#define SCER_SHOW_SUBFRAME (1 << 3)
 
 /* RenderData.mode */
-#define R_OSA                   (1 << 0)
-#define R_MODE_UNUSED_1         (1 << 1)  /* cleared */
-#define R_MODE_UNUSED_2         (1 << 2)  /* cleared */
-#define R_MODE_UNUSED_3         (1 << 3)  /* cleared */
-#define R_MODE_UNUSED_4         (1 << 4)  /* cleared */
-#define R_MODE_UNUSED_5         (1 << 5)  /* cleared */
-#define R_MODE_UNUSED_6         (1 << 6)  /* cleared */
-#define R_MODE_UNUSED_7         (1 << 7)  /* cleared */
-#define R_MODE_UNUSED_8         (1 << 8)  /* cleared */
-#define R_BORDER                (1 << 9)
-#define R_MODE_UNUSED_10        (1 << 10)  /* cleared */
-#define R_CROP                  (1 << 11)
+#define R_OSA (1 << 0)
+#define R_MODE_UNUSED_1 (1 << 1) /* cleared */
+#define R_MODE_UNUSED_2 (1 << 2) /* cleared */
+#define R_MODE_UNUSED_3 (1 << 3) /* cleared */
+#define R_MODE_UNUSED_4 (1 << 4) /* cleared */
+#define R_MODE_UNUSED_5 (1 << 5) /* cleared */
+#define R_MODE_UNUSED_6 (1 << 6) /* cleared */
+#define R_MODE_UNUSED_7 (1 << 7) /* cleared */
+#define R_MODE_UNUSED_8 (1 << 8) /* cleared */
+#define R_BORDER (1 << 9)
+#define R_MODE_UNUSED_10 (1 << 10) /* cleared */
+#define R_CROP (1 << 11)
 /* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
-#define R_NO_CAMERA_SWITCH      (1 << 12)
-#define R_MODE_UNUSED_13        (1 << 13)  /* cleared */
-#define R_MBLUR                 (1 << 14)
-		/* unified was here */
-#define R_MODE_UNUSED_16        (1 << 16)  /* cleared */
-#define R_MODE_UNUSED_17        (1 << 17)  /* cleared */
-#define R_MODE_UNUSED_18        (1 << 18)  /* cleared */
-#define R_MODE_UNUSED_19        (1 << 19)  /* cleared */
-#define R_FIXED_THREADS         (1 << 19)
-
-#define R_MODE_UNUSED_20        (1 << 20)  /* cleared */
-#define R_MODE_UNUSED_21        (1 << 21)  /* cleared */
-#define R_NO_OVERWRITE          (1 << 22)  /* skip existing files */
-#define R_TOUCH                 (1 << 23)  /* touch files before rendering */
-#define R_SIMPLIFY              (1 << 24)
-#define R_EDGE_FRS              (1 << 25) /* R_EDGE reserved for Freestyle */
-#define R_PERSISTENT_DATA       (1 << 26) /* keep data around for re-render */
-#define R_MODE_UNUSED_27        (1 << 27)  /* cleared */
+#define R_NO_CAMERA_SWITCH (1 << 12)
+#define R_MODE_UNUSED_13 (1 << 13) /* cleared */
+#define R_MBLUR (1 << 14)
+/* unified was here */
+#define R_MODE_UNUSED_16 (1 << 16) /* cleared */
+#define R_MODE_UNUSED_17 (1 << 17) /* cleared */
+#define R_MODE_UNUSED_18 (1 << 18) /* cleared */
+#define R_MODE_UNUSED_19 (1 << 19) /* cleared */
+#define R_FIXED_THREADS (1 << 19)
+
+#define R_MODE_UNUSED_20 (1 << 20) /* cleared */
+#define R_MODE_UNUSED_21 (1 << 21) /* cleared */
+#define R_NO_OVERWRITE (1 << 22)   /* skip existing files */
+#define R_TOUCH (1 << 23)          /* touch files before rendering */
+#define R_SIMPLIFY (1 << 24)
+#define R_EDGE_FRS (1 << 25)        /* R_EDGE reserved for Freestyle */
+#define R_PERSISTENT_DATA (1 << 26) /* keep data around for re-render */
+#define R_MODE_UNUSED_27 (1 << 27)  /* cleared */
 
 /* RenderData.seq_flag */
 enum {
-	R_SEQ_UNUSED_0   = (1 << 0),  /* cleared */
-	R_SEQ_UNUSED_1   = (1 << 1),  /* cleared */
-	R_SEQ_UNUSED_2   = (1 << 2),  /* cleared */
-	R_SEQ_SOLID_TEX  = (1 << 3),
-	R_SEQ_CAMERA_DOF = (1 << 4),
+  R_SEQ_UNUSED_0 = (1 << 0), /* cleared */
+  R_SEQ_UNUSED_1 = (1 << 1), /* cleared */
+  R_SEQ_UNUSED_2 = (1 << 2), /* cleared */
+  R_SEQ_SOLID_TEX = (1 << 3),
+  R_SEQ_CAMERA_DOF = (1 << 4),
 };
 
 /* RenderData.displaymode */
-#define R_OUTPUT_SCREEN	0
-#define R_OUTPUT_AREA	1
-#define R_OUTPUT_WINDOW	2
-#define R_OUTPUT_NONE	3
-/*#define R_OUTPUT_FORKED	4*/
+#define R_OUTPUT_SCREEN 0
+#define R_OUTPUT_AREA 1
+#define R_OUTPUT_WINDOW 2
+#define R_OUTPUT_NONE 3
+/*#define R_OUTPUT_FORKED   4*/
 
 /* RenderData.filtertype (used for nodes) */
-#define R_FILTER_BOX	0
-#define R_FILTER_TENT	1
-#define R_FILTER_QUAD	2
-#define R_FILTER_CUBIC	3
-#define R_FILTER_CATROM	4
-#define R_FILTER_GAUSS	5
-#define R_FILTER_MITCH	6
-#define R_FILTER_FAST_GAUSS	7
+#define R_FILTER_BOX 0
+#define R_FILTER_TENT 1
+#define R_FILTER_QUAD 2
+#define R_FILTER_CUBIC 3
+#define R_FILTER_CATROM 4
+#define R_FILTER_GAUSS 5
+#define R_FILTER_MITCH 6
+#define R_FILTER_FAST_GAUSS 7
 
 /* RenderData.scemode */
-#define R_DOSEQ                 (1 << 0)
-#define R_BG_RENDER             (1 << 1)
-		/* passepartout is camera option now, keep this for backward compatibility */
-#define R_PASSEPARTOUT          (1 << 2)
-#define R_BUTS_PREVIEW          (1 << 3)
-#define R_EXTENSION             (1 << 4)
-#define R_MATNODE_PREVIEW       (1 << 5)
-#define R_DOCOMP                (1 << 6)
-#define R_COMP_CROP             (1 << 7)
-#define R_SCEMODE_UNUSED_8      (1 << 8)  /* cleared */
-#define R_SINGLE_LAYER          (1 << 9)
-#define R_EXR_TILE_FILE         (1 << 10)
-#define R_SCEMODE_UNUSED_11     (1 << 11)  /* cleared */
-#define R_NO_IMAGE_LOAD         (1 << 12)
-#define R_SCEMODE_UNUSED_13     (1 << 13)  /* cleared */
-#define R_NO_FRAME_UPDATE       (1 << 14)
-#define R_FULL_SAMPLE           (1 << 15)
-#define R_SCEMODE_UNUSED_16     (1 << 16)  /* cleared */
-#define R_SCEMODE_UNUSED_17     (1 << 17)  /* cleared */
-#define R_TEXNODE_PREVIEW       (1 << 18)
-#define R_SCEMODE_UNUSED_19     (1 << 19)  /* cleared */
-#define R_EXR_CACHE_FILE        (1 << 20)
-#define R_MULTIVIEW             (1 << 21)
+#define R_DOSEQ (1 << 0)
+#define R_BG_RENDER (1 << 1)
+/* passepartout is camera option now, keep this for backward compatibility */
+#define R_PASSEPARTOUT (1 << 2)
+#define R_BUTS_PREVIEW (1 << 3)
+#define R_EXTENSION (1 << 4)
+#define R_MATNODE_PREVIEW (1 << 5)
+#define R_DOCOMP (1 << 6)
+#define R_COMP_CROP (1 << 7)
+#define R_SCEMODE_UNUSED_8 (1 << 8) /* cleared */
+#define R_SINGLE_LAYER (1 << 9)
+#define R_EXR_TILE_FILE (1 << 10)
+#define R_SCEMODE_UNUSED_11 (1 << 11) /* cleared */
+#define R_NO_IMAGE_LOAD (1 << 12)
+#define R_SCEMODE_UNUSED_13 (1 << 13) /* cleared */
+#define R_NO_FRAME_UPDATE (1 << 14)
+#define R_FULL_SAMPLE (1 << 15)
+#define R_SCEMODE_UNUSED_16 (1 << 16) /* cleared */
+#define R_SCEMODE_UNUSED_17 (1 << 17) /* cleared */
+#define R_TEXNODE_PREVIEW (1 << 18)
+#define R_SCEMODE_UNUSED_19 (1 << 19) /* cleared */
+#define R_EXR_CACHE_FILE (1 << 20)
+#define R_MULTIVIEW (1 << 21)
 
 /* RenderData.stamp */
-#define R_STAMP_TIME 	(1 << 0)
-#define R_STAMP_FRAME	(1 << 1)
-#define R_STAMP_DATE	(1 << 2)
-#define R_STAMP_CAMERA	(1 << 3)
-#define R_STAMP_SCENE	(1 << 4)
-#define R_STAMP_NOTE	(1 << 5)
-#define R_STAMP_DRAW	(1 << 6) /* draw in the image */
-#define R_STAMP_MARKER	(1 << 7)
-#define R_STAMP_FILENAME	(1 << 8)
-#define R_STAMP_SEQSTRIP	(1 << 9)
-#define R_STAMP_RENDERTIME	(1 << 10)
-#define R_STAMP_CAMERALENS	(1 << 11)
-#define R_STAMP_STRIPMETA	(1 << 12)
-#define R_STAMP_MEMORY		(1 << 13)
-#define R_STAMP_HIDE_LABELS	(1 << 14)
-#define R_STAMP_FRAME_RANGE	(1 << 15)
-#define R_STAMP_HOSTNAME	(1 << 16)
-#define R_STAMP_ALL (R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_CAMERA|R_STAMP_SCENE| \
-                     R_STAMP_NOTE|R_STAMP_MARKER|R_STAMP_FILENAME|R_STAMP_SEQSTRIP|        \
-                     R_STAMP_RENDERTIME|R_STAMP_CAMERALENS|R_STAMP_MEMORY|                 \
-                     R_STAMP_HIDE_LABELS|R_STAMP_FRAME_RANGE|R_STAMP_HOSTNAME)
+#define R_STAMP_TIME (1 << 0)
+#define R_STAMP_FRAME (1 << 1)
+#define R_STAMP_DATE (1 << 2)
+#define R_STAMP_CAMERA (1 << 3)
+#define R_STAMP_SCENE (1 << 4)
+#define R_STAMP_NOTE (1 << 5)
+#define R_STAMP_DRAW (1 << 6) /* draw in the image */
+#define R_STAMP_MARKER (1 << 7)
+#define R_STAMP_FILENAME (1 << 8)
+#define R_STAMP_SEQSTRIP (1 << 9)
+#define R_STAMP_RENDERTIME (1 << 10)
+#define R_STAMP_CAMERALENS (1 << 11)
+#define R_STAMP_STRIPMETA (1 << 12)
+#define R_STAMP_MEMORY (1 << 13)
+#define R_STAMP_HIDE_LABELS (1 << 14)
+#define R_STAMP_FRAME_RANGE (1 << 15)
+#define R_STAMP_HOSTNAME (1 << 16)
+#define R_STAMP_ALL \
+  (R_STAMP_TIME | R_STAMP_FRAME | R_STAMP_DATE | R_STAMP_CAMERA | R_STAMP_SCENE | R_STAMP_NOTE | \
+   R_STAMP_MARKER | R_STAMP_FILENAME | R_STAMP_SEQSTRIP | R_STAMP_RENDERTIME | \
+   R_STAMP_CAMERALENS | R_STAMP_MEMORY | R_STAMP_HIDE_LABELS | R_STAMP_FRAME_RANGE | \
+   R_STAMP_HOSTNAME)
 
 /** #RenderData.alphamode */
-#define R_ADDSKY		0
-#define R_ALPHAPREMUL	1
+#define R_ADDSKY 0
+#define R_ALPHAPREMUL 1
 
 /* RenderData.color_mgt_flag */
 enum {
-	/** deprecated, should only be used in versioning code only */
-	R_COLOR_MANAGEMENT              = (1 << 0),
-	R_COLOR_MANAGEMENT_UNUSED_1 = (1 << 1),
+  /** deprecated, should only be used in versioning code only */
+  R_COLOR_MANAGEMENT = (1 << 0),
+  R_COLOR_MANAGEMENT_UNUSED_1 = (1 << 1),
 };
 
 #ifdef DNA_DEPRECATED
 /* RenderData.subimtype flag options for imtype */
 enum {
-	R_OPENEXR_HALF  = (1 << 0),  /*deprecated*/
-	R_OPENEXR_ZBUF  = (1 << 1),  /*deprecated*/
-	R_PREVIEW_JPG   = (1 << 2),  /*deprecated*/
-	R_CINEON_LOG    = (1 << 3),  /*deprecated*/
-	R_TIFF_16BIT    = (1 << 4),  /*deprecated*/
-
-	R_JPEG2K_12BIT          =     (1 << 5),  /* Jpeg2000 */                    /*deprecated*/
-	R_JPEG2K_16BIT          =     (1 << 6),                                    /*deprecated*/
-	R_JPEG2K_YCC            =     (1 << 7),  /* when disabled use RGB */      /*deprecated*/
-	R_JPEG2K_CINE_PRESET    =     (1 << 8),                                   /*deprecated*/
-	R_JPEG2K_CINE_48FPS     =     (1 << 9),                                   /*deprecated*/
+  R_OPENEXR_HALF = (1 << 0), /*deprecated*/
+  R_OPENEXR_ZBUF = (1 << 1), /*deprecated*/
+  R_PREVIEW_JPG = (1 << 2),  /*deprecated*/
+  R_CINEON_LOG = (1 << 3),   /*deprecated*/
+  R_TIFF_16BIT = (1 << 4),   /*deprecated*/
+
+  R_JPEG2K_12BIT = (1 << 5),
+  /* Jpeg2000 */             /*deprecated*/
+  R_JPEG2K_16BIT = (1 << 6), /*deprecated*/
+  R_JPEG2K_YCC = (1 << 7),
+  /* when disabled use RGB */      /*deprecated*/
+  R_JPEG2K_CINE_PRESET = (1 << 8), /*deprecated*/
+  R_JPEG2K_CINE_48FPS = (1 << 9),  /*deprecated*/
 };
 #endif
 
 /* bake_mode: same as RE_BAKE_xxx defines */
 /* RenderData.bake_flag */
-#define R_BAKE_CLEAR        (1 << 0)
+#define R_BAKE_CLEAR (1 << 0)
 /* #define R_BAKE_OSA       (1 << 1) */ /* deprecated */
-#define R_BAKE_TO_ACTIVE    (1 << 2)
+#define R_BAKE_TO_ACTIVE (1 << 2)
 /* #define R_BAKE_NORMALIZE (1 << 3) */ /* deprecated */
-#define R_BAKE_MULTIRES     (1 << 4)
-#define R_BAKE_LORES_MESH   (1 << 5)
+#define R_BAKE_MULTIRES (1 << 4)
+#define R_BAKE_LORES_MESH (1 << 5)
 /* #define R_BAKE_VCOL      (1 << 6) */ /* deprecated */
-#define R_BAKE_USERSCALE    (1 << 7)
-#define R_BAKE_CAGE         (1 << 8)
-#define R_BAKE_SPLIT_MAT    (1 << 9)
-#define R_BAKE_AUTO_NAME    (1 << 10)
+#define R_BAKE_USERSCALE (1 << 7)
+#define R_BAKE_CAGE (1 << 8)
+#define R_BAKE_SPLIT_MAT (1 << 9)
+#define R_BAKE_AUTO_NAME (1 << 10)
 
 /* RenderData.bake_normal_space */
-#define R_BAKE_SPACE_CAMERA	 0
-#define R_BAKE_SPACE_WORLD	 1
-#define R_BAKE_SPACE_OBJECT	 2
+#define R_BAKE_SPACE_CAMERA 0
+#define R_BAKE_SPACE_WORLD 1
+#define R_BAKE_SPACE_OBJECT 2
 #define R_BAKE_SPACE_TANGENT 3
 
 /* RenderData.line_thickness_mode */
@@ -1961,218 +1953,212 @@ extern const char *RE_engine_id_CYCLES;
 /* Current precision is 16 for the sub-frames closer to MAXFRAME. */
 
 /* for general use */
-#define MAXFRAME	1048574
-#define MAXFRAMEF	1048574.0f
+#define MAXFRAME 1048574
+#define MAXFRAMEF 1048574.0f
 
-#define MINFRAME	0
-#define MINFRAMEF	0.0f
+#define MINFRAME 0
+#define MINFRAMEF 0.0f
 
 /* (minimum frame number for current-frame) */
-#define MINAFRAME	-1048574
-#define MINAFRAMEF	-1048574.0f
-
-#define BASE_VISIBLE(v3d, base) (                                                                        \
-	((v3d == NULL) || ((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
-	((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) &&     \
-	(((base)->flag & BASE_VISIBLE) != 0))
-#define BASE_SELECTABLE(v3d, base) (                                                               \
-	BASE_VISIBLE(v3d, base) &&                                                                     \
-	((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_select) == 0)) && \
-	(((base)->flag & BASE_SELECTABLE) != 0))
-#define BASE_SELECTED(v3d, base) \
-	(BASE_VISIBLE(v3d, base) && (((base)->flag & BASE_SELECTED) != 0))
-#define BASE_EDITABLE(v3d, base) \
-	(BASE_VISIBLE(v3d, base) && ((base)->object->id.lib == NULL))
+#define MINAFRAME -1048574
+#define MINAFRAMEF -1048574.0f
+
+#define BASE_VISIBLE(v3d, base) \
+  (((v3d == NULL) || ((v3d)->localvd == NULL) || \
+    ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+   ((v3d == NULL) || \
+    (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \
+   (((base)->flag & BASE_VISIBLE) != 0))
+#define BASE_SELECTABLE(v3d, base) \
+  (BASE_VISIBLE(v3d, base) && \
+   ((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_select) == 0)) && \
+   (((base)->flag & BASE_SELECTABLE) != 0))
+#define BASE_SELECTED(v3d, base) (BASE_VISIBLE(v3d, base) && (((base)->flag & BASE_SELECTED) != 0))
+#define BASE_EDITABLE(v3d, base) (BASE_VISIBLE(v3d, base) && ((base)->object->id.lib == NULL))
 #define BASE_SELECTED_EDITABLE(v3d, base) \
-	(BASE_EDITABLE(v3d, base) && (((base)->flag & BASE_SELECTED) != 0))
+  (BASE_EDITABLE(v3d, base) && (((base)->flag & BASE_SELECTED) != 0))
 
 /* deprecate this! */
-#define FIRSTBASE(_view_layer)  ((_view_layer)->object_bases.first)
-#define LASTBASE(_view_layer)   ((_view_layer)->object_bases.last)
-#define BASACT(_view_layer)     ((_view_layer)->basact)
-#define OBACT(_view_layer)      (BASACT(_view_layer) ? BASACT(_view_layer)->object: NULL)
+#define FIRSTBASE(_view_layer) ((_view_layer)->object_bases.first)
+#define LASTBASE(_view_layer) ((_view_layer)->object_bases.last)
+#define BASACT(_view_layer) ((_view_layer)->basact)
+#define OBACT(_view_layer) (BASACT(_view_layer) ? BASACT(_view_layer)->object : NULL)
 
 #define OBEDIT_FROM_WORKSPACE(workspace, _view_layer) \
-	(((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL)
-#define OBEDIT_FROM_OBACT(ob) \
-	((ob) ? (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) : NULL)
-#define OBPOSE_FROM_OBACT(ob) \
-	((ob) ? (((ob)->mode & OB_MODE_POSE) ? ob : NULL) : NULL)
-#define OBEDIT_FROM_VIEW_LAYER(view_layer) \
-	OBEDIT_FROM_OBACT(OBACT(view_layer))
+  (((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL)
+#define OBEDIT_FROM_OBACT(ob) ((ob) ? (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) : NULL)
+#define OBPOSE_FROM_OBACT(ob) ((ob) ? (((ob)->mode & OB_MODE_POSE) ? ob : NULL) : NULL)
+#define OBEDIT_FROM_VIEW_LAYER(view_layer) OBEDIT_FROM_OBACT(OBACT(view_layer))
 
 #define V3D_CAMERA_LOCAL(v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : NULL)
-#define V3D_CAMERA_SCENE(scene, v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera)
-
-#define CFRA            (scene->r.cfra)
-#define SUBFRA          (scene->r.subframe)
-#define SFRA            (scene->r.sfra)
-#define EFRA            (scene->r.efra)
-#define PRVRANGEON      (scene->r.flag & SCER_PRV_RANGE)
-#define PSFRA           ((PRVRANGEON) ? (scene->r.psfra) : (scene->r.sfra))
-#define PEFRA           ((PRVRANGEON) ? (scene->r.pefra) : (scene->r.efra))
-#define FRA2TIME(a)     ((((double) scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec)
-#define TIME2FRA(a)     ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
-#define FPS              (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base)
+#define V3D_CAMERA_SCENE(scene, v3d) \
+  ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera)
+
+#define CFRA (scene->r.cfra)
+#define SUBFRA (scene->r.subframe)
+#define SFRA (scene->r.sfra)
+#define EFRA (scene->r.efra)
+#define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE)
+#define PSFRA ((PRVRANGEON) ? (scene->r.psfra) : (scene->r.sfra))
+#define PEFRA ((PRVRANGEON) ? (scene->r.pefra) : (scene->r.efra))
+#define FRA2TIME(a) ((((double)scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec)
+#define TIME2FRA(a) ((((double)scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
+#define FPS (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base)
 
 /* Base.flag is in DNA_object_types.h */
 
 /* ToolSettings.transform_flag */
 enum {
-	SCE_XFORM_AXIS_ALIGN = (1 << 0),
+  SCE_XFORM_AXIS_ALIGN = (1 << 0),
 };
 
 /* ToolSettings.object_flag */
 enum {
-	SCE_OBJECT_MODE_LOCK = (1 << 0),
+  SCE_OBJECT_MODE_LOCK = (1 << 0),
 };
 
 /* ToolSettings.snap_flag */
-#define SCE_SNAP				(1 << 0)
-#define SCE_SNAP_ROTATE			(1 << 1)
-#define SCE_SNAP_PEEL_OBJECT	(1 << 2)
-#define SCE_SNAP_PROJECT		(1 << 3)
-#define SCE_SNAP_NO_SELF		(1 << 4)
-#define SCE_SNAP_ABS_GRID		(1 << 5)
+#define SCE_SNAP (1 << 0)
+#define SCE_SNAP_ROTATE (1 << 1)
+#define SCE_SNAP_PEEL_OBJECT (1 << 2)
+#define SCE_SNAP_PROJECT (1 << 3)
+#define SCE_SNAP_NO_SELF (1 << 4)
+#define SCE_SNAP_ABS_GRID (1 << 5)
 
 /* ToolSettings.snap_target */
-#define SCE_SNAP_TARGET_CLOSEST	0
-#define SCE_SNAP_TARGET_CENTER	1
-#define SCE_SNAP_TARGET_MEDIAN	2
-#define SCE_SNAP_TARGET_ACTIVE	3
+#define SCE_SNAP_TARGET_CLOSEST 0
+#define SCE_SNAP_TARGET_CENTER 1
+#define SCE_SNAP_TARGET_MEDIAN 2
+#define SCE_SNAP_TARGET_ACTIVE 3
 
 /* ToolSettings.snap_mode */
-#define SCE_SNAP_MODE_VERTEX    (1 << 0)
-#define SCE_SNAP_MODE_EDGE      (1 << 1)
-#define SCE_SNAP_MODE_FACE      (1 << 2)
-#define SCE_SNAP_MODE_VOLUME    (1 << 3)
+#define SCE_SNAP_MODE_VERTEX (1 << 0)
+#define SCE_SNAP_MODE_EDGE (1 << 1)
+#define SCE_SNAP_MODE_FACE (1 << 2)
+#define SCE_SNAP_MODE_VOLUME (1 << 3)
 #define SCE_SNAP_MODE_INCREMENT (1 << 4)
 
 /* ToolSettings.snap_node_mode */
-#define SCE_SNAP_MODE_GRID      (1 << 5)
-#define SCE_SNAP_MODE_NODE_X    (1 << 6)
-#define SCE_SNAP_MODE_NODE_Y    (1 << 7)
+#define SCE_SNAP_MODE_GRID (1 << 5)
+#define SCE_SNAP_MODE_NODE_X (1 << 6)
+#define SCE_SNAP_MODE_NODE_Y (1 << 7)
 
 /** #ToolSettings.snap_transform_mode_flag */
 enum {
-	SCE_SNAP_TRANSFORM_MODE_TRANSLATE  = (1 << 0),
-	SCE_SNAP_TRANSFORM_MODE_ROTATE     = (1 << 1),
-	SCE_SNAP_TRANSFORM_MODE_SCALE      = (1 << 2),
+  SCE_SNAP_TRANSFORM_MODE_TRANSLATE = (1 << 0),
+  SCE_SNAP_TRANSFORM_MODE_ROTATE = (1 << 1),
+  SCE_SNAP_TRANSFORM_MODE_SCALE = (1 << 2),
 };
 
 /* ToolSettings.selectmode */
-#define SCE_SELECT_VERTEX	(1 << 0) /* for mesh */
-#define SCE_SELECT_EDGE		(1 << 1)
-#define SCE_SELECT_FACE		(1 << 2)
+#define SCE_SELECT_VERTEX (1 << 0) /* for mesh */
+#define SCE_SELECT_EDGE (1 << 1)
+#define SCE_SELECT_FACE (1 << 2)
 
 /* MeshStatVis.type */
-#define SCE_STATVIS_OVERHANG	0
-#define SCE_STATVIS_THICKNESS	1
-#define SCE_STATVIS_INTERSECT	2
-#define SCE_STATVIS_DISTORT		3
-#define SCE_STATVIS_SHARP		4
+#define SCE_STATVIS_OVERHANG 0
+#define SCE_STATVIS_THICKNESS 1
+#define SCE_STATVIS_INTERSECT 2
+#define SCE_STATVIS_DISTORT 3
+#define SCE_STATVIS_SHARP 4
 
 /* ParticleEditSettings.selectmode for particles */
-#define SCE_SELECT_PATH		(1 << 0)
-#define SCE_SELECT_POINT	(1 << 1)
-#define SCE_SELECT_END		(1 << 2)
+#define SCE_SELECT_PATH (1 << 0)
+#define SCE_SELECT_POINT (1 << 1)
+#define SCE_SELECT_END (1 << 2)
 
 /* ToolSettings.prop_mode (proportional falloff) */
-#define PROP_SMOOTH            0
-#define PROP_SPHERE            1
-#define PROP_ROOT              2
-#define PROP_SHARP             3
-#define PROP_LIN               4
-#define PROP_CONST             5
-#define PROP_RANDOM            6
-#define PROP_INVSQUARE         7
-#define PROP_MODE_MAX          8
+#define PROP_SMOOTH 0
+#define PROP_SPHERE 1
+#define PROP_ROOT 2
+#define PROP_SHARP 3
+#define PROP_LIN 4
+#define PROP_CONST 5
+#define PROP_RANDOM 6
+#define PROP_INVSQUARE 7
+#define PROP_MODE_MAX 8
 
 /* ToolSettings.proportional */
-#define PROP_EDIT_OFF			0
-#define PROP_EDIT_ON			1
-#define PROP_EDIT_CONNECTED		2
-#define PROP_EDIT_PROJECTED		3
+#define PROP_EDIT_OFF 0
+#define PROP_EDIT_ON 1
+#define PROP_EDIT_CONNECTED 2
+#define PROP_EDIT_PROJECTED 3
 
 /* ToolSettings.weightuser */
 enum {
-	OB_DRAW_GROUPUSER_NONE      = 0,
-	OB_DRAW_GROUPUSER_ACTIVE    = 1,
-	OB_DRAW_GROUPUSER_ALL       = 2,
+  OB_DRAW_GROUPUSER_NONE = 0,
+  OB_DRAW_GROUPUSER_ACTIVE = 1,
+  OB_DRAW_GROUPUSER_ALL = 2,
 };
 
 /* toolsettings->face_strength */
 enum {
-	FACE_STRENGTH_WEAK = -16384,
-	FACE_STRENGTH_MEDIUM = 0,
-	FACE_STRENGTH_STRONG = 16384,
+  FACE_STRENGTH_WEAK = -16384,
+  FACE_STRENGTH_MEDIUM = 0,
+  FACE_STRENGTH_STRONG = 16384,
 };
 
 /* object_vgroup.c */
 /* ToolSettings.vgroupsubset */
 typedef enum eVGroupSelect {
-	WT_VGROUP_ALL = 0,
-	WT_VGROUP_ACTIVE = 1,
-	WT_VGROUP_BONE_SELECT = 2,
-	WT_VGROUP_BONE_DEFORM = 3,
-	WT_VGROUP_BONE_DEFORM_OFF = 4,
+  WT_VGROUP_ALL = 0,
+  WT_VGROUP_ACTIVE = 1,
+  WT_VGROUP_BONE_SELECT = 2,
+  WT_VGROUP_BONE_DEFORM = 3,
+  WT_VGROUP_BONE_DEFORM_OFF = 4,
 } eVGroupSelect;
 
 #define WT_VGROUP_MASK_ALL \
-	((1 << WT_VGROUP_ACTIVE) | \
-	 (1 << WT_VGROUP_BONE_SELECT) | \
-	 (1 << WT_VGROUP_BONE_DEFORM) | \
-	 (1 << WT_VGROUP_BONE_DEFORM_OFF) | \
-	 (1 << WT_VGROUP_ALL))
-
+  ((1 << WT_VGROUP_ACTIVE) | (1 << WT_VGROUP_BONE_SELECT) | (1 << WT_VGROUP_BONE_DEFORM) | \
+   (1 << WT_VGROUP_BONE_DEFORM_OFF) | (1 << WT_VGROUP_ALL))
 
 /* Scene.flag */
-#define SCE_DS_SELECTED			(1 << 0)
-#define SCE_DS_COLLAPSED		(1 << 1)
-#define SCE_NLA_EDIT_ON			(1 << 2)
-#define SCE_FRAME_DROP			(1 << 3)
-#define SCE_KEYS_NO_SELONLY	    (1 << 4)
-
-	/* return flag BKE_scene_base_iter_next functions */
-/* #define F_ERROR			-1 */  /* UNUSED */
-#define F_START			0
-#define F_SCENE			1
-#define F_DUPLI			3
+#define SCE_DS_SELECTED (1 << 0)
+#define SCE_DS_COLLAPSED (1 << 1)
+#define SCE_NLA_EDIT_ON (1 << 2)
+#define SCE_FRAME_DROP (1 << 3)
+#define SCE_KEYS_NO_SELONLY (1 << 4)
+
+/* return flag BKE_scene_base_iter_next functions */
+/* #define F_ERROR          -1 */ /* UNUSED */
+#define F_START 0
+#define F_SCENE 1
+#define F_DUPLI 3
 
 /* AudioData.flag */
-#define AUDIO_MUTE                (1 << 0)
-#define AUDIO_SYNC                (1 << 1)
-#define AUDIO_SCRUB		          (1 << 2)
-#define AUDIO_VOLUME_ANIMATED     (1 << 3)
+#define AUDIO_MUTE (1 << 0)
+#define AUDIO_SYNC (1 << 1)
+#define AUDIO_SCRUB (1 << 2)
+#define AUDIO_VOLUME_ANIMATED (1 << 3)
 
 /* FFMpegCodecData.flags */
 enum {
 #ifdef DNA_DEPRECATED
-	FFMPEG_MULTIPLEX_AUDIO  = (1 << 0),  /* deprecated, you can choose none as audiocodec now */
+  FFMPEG_MULTIPLEX_AUDIO = (1 << 0), /* deprecated, you can choose none as audiocodec now */
 #endif
-	FFMPEG_AUTOSPLIT_OUTPUT = (1 << 1),
-	FFMPEG_LOSSLESS_OUTPUT  = (1 << 2),
-	FFMPEG_USE_MAX_B_FRAMES = (1 << 3),
+  FFMPEG_AUTOSPLIT_OUTPUT = (1 << 1),
+  FFMPEG_LOSSLESS_OUTPUT = (1 << 2),
+  FFMPEG_USE_MAX_B_FRAMES = (1 << 3),
 };
 
 /* Paint.flags */
 typedef enum ePaintFlags {
-	PAINT_SHOW_BRUSH = (1 << 0),
-	PAINT_FAST_NAVIGATE = (1 << 1),
-	PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
-	PAINT_USE_CAVITY_MASK = (1 << 3),
+  PAINT_SHOW_BRUSH = (1 << 0),
+  PAINT_FAST_NAVIGATE = (1 << 1),
+  PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
+  PAINT_USE_CAVITY_MASK = (1 << 3),
 } ePaintFlags;
 
 /* Paint.symmetry_flags
  * (for now just a duplicate of sculpt symmetry flags) */
 typedef enum ePaintSymmetryFlags {
-	PAINT_SYMM_X = (1 << 0),
-	PAINT_SYMM_Y = (1 << 1),
-	PAINT_SYMM_Z = (1 << 2),
-	PAINT_SYMMETRY_FEATHER = (1 << 3),
-	PAINT_TILE_X = (1 << 4),
-	PAINT_TILE_Y = (1 << 5),
-	PAINT_TILE_Z = (1 << 6),
+  PAINT_SYMM_X = (1 << 0),
+  PAINT_SYMM_Y = (1 << 1),
+  PAINT_SYMM_Z = (1 << 2),
+  PAINT_SYMMETRY_FEATHER = (1 << 3),
+  PAINT_TILE_X = (1 << 4),
+  PAINT_TILE_Y = (1 << 5),
+  PAINT_TILE_Z = (1 << 6),
 } ePaintSymmetryFlags;
 
 #define PAINT_SYMM_AXIS_ALL (PAINT_SYMM_X | PAINT_SYMM_Y | PAINT_SYMM_Z)
@@ -2180,244 +2166,244 @@ typedef enum ePaintSymmetryFlags {
 /* Sculpt.flags */
 /* These can eventually be moved to paint flags? */
 typedef enum eSculptFlags {
-	SCULPT_FLAG_UNUSED_0 = (1 << 0),  /* cleared */
-	SCULPT_FLAG_UNUSED_1 = (1 << 1),  /* cleared */
-	SCULPT_FLAG_UNUSED_2 = (1 << 2),  /* cleared */
+  SCULPT_FLAG_UNUSED_0 = (1 << 0), /* cleared */
+  SCULPT_FLAG_UNUSED_1 = (1 << 1), /* cleared */
+  SCULPT_FLAG_UNUSED_2 = (1 << 2), /* cleared */
 
-	SCULPT_LOCK_X = (1 << 3),
-	SCULPT_LOCK_Y = (1 << 4),
-	SCULPT_LOCK_Z = (1 << 5),
+  SCULPT_LOCK_X = (1 << 3),
+  SCULPT_LOCK_Y = (1 << 4),
+  SCULPT_LOCK_Z = (1 << 5),
 
-	SCULPT_FLAG_UNUSED_6 = (1 << 6),  /* cleared */
+  SCULPT_FLAG_UNUSED_6 = (1 << 6), /* cleared */
 
-	SCULPT_USE_OPENMP = (1 << 7),
-	SCULPT_ONLY_DEFORM = (1 << 8),
-	SCULPT_SHOW_DIFFUSE = (1 << 9),
+  SCULPT_USE_OPENMP = (1 << 7),
+  SCULPT_ONLY_DEFORM = (1 << 8),
+  SCULPT_SHOW_DIFFUSE = (1 << 9),
 
-	/* If set, the mesh will be drawn with smooth-shading in
-	 * dynamic-topology mode */
-	SCULPT_DYNTOPO_SMOOTH_SHADING = (1 << 10),
+  /* If set, the mesh will be drawn with smooth-shading in
+   * dynamic-topology mode */
+  SCULPT_DYNTOPO_SMOOTH_SHADING = (1 << 10),
 
-	/* If set, dynamic-topology brushes will subdivide short edges */
-	SCULPT_DYNTOPO_SUBDIVIDE = (1 << 12),
-	/* If set, dynamic-topology brushes will collapse short edges */
-	SCULPT_DYNTOPO_COLLAPSE = (1 << 11),
+  /* If set, dynamic-topology brushes will subdivide short edges */
+  SCULPT_DYNTOPO_SUBDIVIDE = (1 << 12),
+  /* If set, dynamic-topology brushes will collapse short edges */
+  SCULPT_DYNTOPO_COLLAPSE = (1 << 11),
 
-	/* If set, dynamic-topology detail size will be constant in object space */
-	SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13),
-	SCULPT_DYNTOPO_DETAIL_BRUSH = (1 << 14),
-	SCULPT_DYNTOPO_DETAIL_MANUAL = (1 << 16),
+  /* If set, dynamic-topology detail size will be constant in object space */
+  SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13),
+  SCULPT_DYNTOPO_DETAIL_BRUSH = (1 << 14),
+  SCULPT_DYNTOPO_DETAIL_MANUAL = (1 << 16),
 
-	/* Don't display mask in viewport, but still use it for strokes. */
-	SCULPT_HIDE_MASK = (1 << 15),
+  /* Don't display mask in viewport, but still use it for strokes. */
+  SCULPT_HIDE_MASK = (1 << 15),
 } eSculptFlags;
 
 /* ImagePaintSettings.mode */
 typedef enum eImagePaintMode {
-	IMAGEPAINT_MODE_MATERIAL, /* detect texture paint slots from the material */
-	IMAGEPAINT_MODE_IMAGE,    /* select texture paint image directly */
+  IMAGEPAINT_MODE_MATERIAL, /* detect texture paint slots from the material */
+  IMAGEPAINT_MODE_IMAGE,    /* select texture paint image directly */
 } eImagePaintMode;
 
 /* ImagePaintSettings.interp */
 enum {
-	IMAGEPAINT_INTERP_LINEAR = 0,
-	IMAGEPAINT_INTERP_CLOSEST,
+  IMAGEPAINT_INTERP_LINEAR = 0,
+  IMAGEPAINT_INTERP_CLOSEST,
 };
 
 /* ImagePaintSettings.flag */
-#define IMAGEPAINT_DRAWING				(1 << 0)
-// #define IMAGEPAINT_DRAW_TOOL			(1 << 1) // deprecated
-// #define IMAGEPAINT_DRAW_TOOL_DRAWING	(1 << 2) // deprecated
+#define IMAGEPAINT_DRAWING (1 << 0)
+// #define IMAGEPAINT_DRAW_TOOL         (1 << 1) // deprecated
+// #define IMAGEPAINT_DRAW_TOOL_DRAWING (1 << 2) // deprecated
 
 /* projection painting only */
 /* ImagePaintSettings.flag */
-#define IMAGEPAINT_PROJECT_XRAY			(1 << 4)
-#define IMAGEPAINT_PROJECT_BACKFACE		(1 << 5)
-#define IMAGEPAINT_PROJECT_FLAT			(1 << 6)
-#define IMAGEPAINT_PROJECT_LAYER_CLONE	(1 << 7)
-#define IMAGEPAINT_PROJECT_LAYER_STENCIL	(1 << 8)
-#define IMAGEPAINT_PROJECT_LAYER_STENCIL_INV	(1 << 9)
+#define IMAGEPAINT_PROJECT_XRAY (1 << 4)
+#define IMAGEPAINT_PROJECT_BACKFACE (1 << 5)
+#define IMAGEPAINT_PROJECT_FLAT (1 << 6)
+#define IMAGEPAINT_PROJECT_LAYER_CLONE (1 << 7)
+#define IMAGEPAINT_PROJECT_LAYER_STENCIL (1 << 8)
+#define IMAGEPAINT_PROJECT_LAYER_STENCIL_INV (1 << 9)
 
 /* ImagePaintSettings.missing_data */
-#define IMAGEPAINT_MISSING_UVS       (1 << 0)
-#define IMAGEPAINT_MISSING_MATERIAL  (1 << 1)
-#define IMAGEPAINT_MISSING_TEX       (1 << 2)
-#define IMAGEPAINT_MISSING_STENCIL   (1 << 3)
+#define IMAGEPAINT_MISSING_UVS (1 << 0)
+#define IMAGEPAINT_MISSING_MATERIAL (1 << 1)
+#define IMAGEPAINT_MISSING_TEX (1 << 2)
+#define IMAGEPAINT_MISSING_STENCIL (1 << 3)
 
 /* ToolSettings.uvcalc_flag */
-#define UVCALC_FILLHOLES			(1 << 0)
+#define UVCALC_FILLHOLES (1 << 0)
 /** would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
-#define UVCALC_NO_ASPECT_CORRECT	(1 << 1)
+#define UVCALC_NO_ASPECT_CORRECT (1 << 1)
 /** adjust UV's while transforming to avoid distortion */
-#define UVCALC_TRANSFORM_CORRECT	(1 << 2)
+#define UVCALC_TRANSFORM_CORRECT (1 << 2)
 /** Use mesh data after subsurf to compute UVs*/
-#define UVCALC_USESUBSURF			(1 << 3)
+#define UVCALC_USESUBSURF (1 << 3)
 
 /* ToolSettings.uv_flag */
-#define UV_SYNC_SELECTION	1
-#define UV_SHOW_SAME_IMAGE	2
+#define UV_SYNC_SELECTION 1
+#define UV_SHOW_SAME_IMAGE 2
 
 /* ToolSettings.uv_selectmode */
-#define UV_SELECT_VERTEX	1
-#define UV_SELECT_EDGE		2
-#define UV_SELECT_FACE		4
-#define UV_SELECT_ISLAND	8
+#define UV_SELECT_VERTEX 1
+#define UV_SELECT_EDGE 2
+#define UV_SELECT_FACE 4
+#define UV_SELECT_ISLAND 8
 
 /* ToolSettings.edge_mode */
-#define EDGE_MODE_SELECT				0
-#define EDGE_MODE_TAG_SEAM				1
-#define EDGE_MODE_TAG_SHARP				2
-#define EDGE_MODE_TAG_CREASE			3
-#define EDGE_MODE_TAG_BEVEL				4
-#define EDGE_MODE_TAG_FREESTYLE			5
+#define EDGE_MODE_SELECT 0
+#define EDGE_MODE_TAG_SEAM 1
+#define EDGE_MODE_TAG_SHARP 2
+#define EDGE_MODE_TAG_CREASE 3
+#define EDGE_MODE_TAG_BEVEL 4
+#define EDGE_MODE_TAG_FREESTYLE 5
 
 /* ToolSettings.gpencil_flags */
 typedef enum eGPencil_Flags {
-	/* When creating new frames, the last frame gets used as the basis for the new one */
-	GP_TOOL_FLAG_RETAIN_LAST            = (1 << 1),
-	/* Add the strokes below all strokes in the layer */
-	GP_TOOL_FLAG_PAINT_ONBACK           = (1 << 2),
-	/* Show compact list of colors */
-	GP_TOOL_FLAG_THUMBNAIL_LIST         = (1 << 3),
-	/* Generate wheight data for new strokes */
-	GP_TOOL_FLAG_CREATE_WEIGHTS         = (1 << 4),
+  /* When creating new frames, the last frame gets used as the basis for the new one */
+  GP_TOOL_FLAG_RETAIN_LAST = (1 << 1),
+  /* Add the strokes below all strokes in the layer */
+  GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2),
+  /* Show compact list of colors */
+  GP_TOOL_FLAG_THUMBNAIL_LIST = (1 << 3),
+  /* Generate wheight data for new strokes */
+  GP_TOOL_FLAG_CREATE_WEIGHTS = (1 << 4),
 } eGPencil_Flags;
 
 /* scene->r.simplify_gpencil */
 typedef enum eGPencil_SimplifyFlags {
-	/* Simplify */
-	SIMPLIFY_GPENCIL_ENABLE           = (1 << 0),
-	/* Simplify on play */
-	SIMPLIFY_GPENCIL_ON_PLAY          = (1 << 1),
-	/* Simplify fill on viewport */
-	SIMPLIFY_GPENCIL_FILL             = (1 << 2),
-	/* Simplify modifier on viewport */
-	SIMPLIFY_GPENCIL_MODIFIER         = (1 << 3),
-	/* Remove fill external line */
-	SIMPLIFY_GPENCIL_REMOVE_FILL_LINE = (1 << 4),
-	/* Simplify Shader FX */
-	SIMPLIFY_GPENCIL_FX               = (1 << 5),
-	/* Simplify layer blending */
-	SIMPLIFY_GPENCIL_BLEND            = (1 << 6),
+  /* Simplify */
+  SIMPLIFY_GPENCIL_ENABLE = (1 << 0),
+  /* Simplify on play */
+  SIMPLIFY_GPENCIL_ON_PLAY = (1 << 1),
+  /* Simplify fill on viewport */
+  SIMPLIFY_GPENCIL_FILL = (1 << 2),
+  /* Simplify modifier on viewport */
+  SIMPLIFY_GPENCIL_MODIFIER = (1 << 3),
+  /* Remove fill external line */
+  SIMPLIFY_GPENCIL_REMOVE_FILL_LINE = (1 << 4),
+  /* Simplify Shader FX */
+  SIMPLIFY_GPENCIL_FX = (1 << 5),
+  /* Simplify layer blending */
+  SIMPLIFY_GPENCIL_BLEND = (1 << 6),
 } eGPencil_SimplifyFlags;
 
 /* ToolSettings.gpencil_*_align - Stroke Placement mode flags */
 typedef enum eGPencil_Placement_Flags {
-	/* New strokes are added in viewport/data space (i.e. not screen space) */
-	GP_PROJECT_VIEWSPACE    = (1 << 0),
+  /* New strokes are added in viewport/data space (i.e. not screen space) */
+  GP_PROJECT_VIEWSPACE = (1 << 0),
 
-	/* Viewport space, but relative to render canvas (Sequencer Preview Only) */
-	GP_PROJECT_CANVAS       = (1 << 1),
+  /* Viewport space, but relative to render canvas (Sequencer Preview Only) */
+  GP_PROJECT_CANVAS = (1 << 1),
 
-	/* Project into the screen's Z values */
-	GP_PROJECT_DEPTH_VIEW	= (1 << 2),
-	GP_PROJECT_DEPTH_STROKE = (1 << 3),
+  /* Project into the screen's Z values */
+  GP_PROJECT_DEPTH_VIEW = (1 << 2),
+  GP_PROJECT_DEPTH_STROKE = (1 << 3),
 
-	/* "Use Endpoints" */
-	GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
-	GP_PROJECT_CURSOR = (1 << 5),
-	GP_PROJECT_DEPTH_STROKE_FIRST = (1 << 6),
+  /* "Use Endpoints" */
+  GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
+  GP_PROJECT_CURSOR = (1 << 5),
+  GP_PROJECT_DEPTH_STROKE_FIRST = (1 << 6),
 } eGPencil_Placement_Flags;
 
 /* ToolSettings.gpencil_selectmode */
 typedef enum eGPencil_Selectmode_types {
-	GP_SELECTMODE_POINT   = 0,
-	GP_SELECTMODE_STROKE  = 1,
-	GP_SELECTMODE_SEGMENT = 2,
+  GP_SELECTMODE_POINT = 0,
+  GP_SELECTMODE_STROKE = 1,
+  GP_SELECTMODE_SEGMENT = 2,
 } eGPencil_Selectmode_types;
 
 /* ToolSettings.gpencil_guide_types */
 typedef enum eGPencil_GuideTypes {
-	GP_GUIDE_CIRCULAR = 0,
-	GP_GUIDE_RADIAL,
-	GP_GUIDE_PARALLEL,
-	GP_GUIDE_GRID,
+  GP_GUIDE_CIRCULAR = 0,
+  GP_GUIDE_RADIAL,
+  GP_GUIDE_PARALLEL,
+  GP_GUIDE_GRID,
 } eGPencil_GuideTypes;
 
 /* ToolSettings.gpencil_guide_references */
 typedef enum eGPencil_Guide_Reference {
-	GP_GUIDE_REF_CURSOR = 0,
-	GP_GUIDE_REF_CUSTOM,
-	GP_GUIDE_REF_OBJECT,
+  GP_GUIDE_REF_CURSOR = 0,
+  GP_GUIDE_REF_CUSTOM,
+  GP_GUIDE_REF_OBJECT,
 } eGPencil_Guide_Reference;
 
 /* ToolSettings.particle flag */
-#define PE_KEEP_LENGTHS         (1 << 0)
-#define PE_LOCK_FIRST           (1 << 1)
-#define PE_DEFLECT_EMITTER      (1 << 2)
-#define PE_INTERPOLATE_ADDED    (1 << 3)
-#define PE_DRAW_PART            (1 << 4)
-#define PE_UNUSED_6             (1 << 6)  /* cleared */
-#define PE_FADE_TIME            (1 << 7)
-#define PE_AUTO_VELOCITY        (1 << 8)
+#define PE_KEEP_LENGTHS (1 << 0)
+#define PE_LOCK_FIRST (1 << 1)
+#define PE_DEFLECT_EMITTER (1 << 2)
+#define PE_INTERPOLATE_ADDED (1 << 3)
+#define PE_DRAW_PART (1 << 4)
+#define PE_UNUSED_6 (1 << 6) /* cleared */
+#define PE_FADE_TIME (1 << 7)
+#define PE_AUTO_VELOCITY (1 << 8)
 
 /* ParticleEditSettings.brushtype */
-#define PE_BRUSH_NONE		-1
-#define PE_BRUSH_COMB		0
-#define PE_BRUSH_CUT		1
-#define PE_BRUSH_LENGTH		2
-#define PE_BRUSH_PUFF		3
-#define PE_BRUSH_ADD		4
-#define PE_BRUSH_SMOOTH		5
-#define PE_BRUSH_WEIGHT		6
+#define PE_BRUSH_NONE -1
+#define PE_BRUSH_COMB 0
+#define PE_BRUSH_CUT 1
+#define PE_BRUSH_LENGTH 2
+#define PE_BRUSH_PUFF 3
+#define PE_BRUSH_ADD 4
+#define PE_BRUSH_SMOOTH 5
+#define PE_BRUSH_WEIGHT 6
 
 /* ParticleBrushData.flag */
 #define PE_BRUSH_DATA_PUFF_VOLUME 1
 
 /* ParticleBrushData.edittype */
-#define PE_TYPE_PARTICLES	0
-#define PE_TYPE_SOFTBODY	1
-#define PE_TYPE_CLOTH		2
+#define PE_TYPE_PARTICLES 0
+#define PE_TYPE_SOFTBODY 1
+#define PE_TYPE_CLOTH 2
 
 /* PhysicsSettings.flag */
-#define PHYS_GLOBAL_GRAVITY		1
+#define PHYS_GLOBAL_GRAVITY 1
 
 /* UnitSettings */
 
 #define USER_UNIT_ADAPTIVE 0xFF
 /* UnitSettings.system */
-#define	USER_UNIT_NONE			0
-#define	USER_UNIT_METRIC		1
-#define	USER_UNIT_IMPERIAL		2
+#define USER_UNIT_NONE 0
+#define USER_UNIT_METRIC 1
+#define USER_UNIT_IMPERIAL 2
 /* UnitSettings.flag */
-#define	USER_UNIT_OPT_SPLIT		1
-#define USER_UNIT_ROT_RADIANS	2
+#define USER_UNIT_OPT_SPLIT 1
+#define USER_UNIT_ROT_RADIANS 2
 
 /* SceneEEVEE->flag */
 enum {
-	SCE_EEVEE_VOLUMETRIC_ENABLED	= (1 << 0),
-	SCE_EEVEE_VOLUMETRIC_LIGHTS		= (1 << 1),
-	SCE_EEVEE_VOLUMETRIC_SHADOWS	= (1 << 2),
-//	SCE_EEVEE_VOLUMETRIC_COLORED	= (1 << 3), /* Unused */
-	SCE_EEVEE_GTAO_ENABLED			= (1 << 4),
-	SCE_EEVEE_GTAO_BENT_NORMALS		= (1 << 5),
-	SCE_EEVEE_GTAO_BOUNCE			= (1 << 6),
-	SCE_EEVEE_DOF_ENABLED			= (1 << 7),
-	SCE_EEVEE_BLOOM_ENABLED			= (1 << 8),
-	SCE_EEVEE_MOTION_BLUR_ENABLED	= (1 << 9),
-	SCE_EEVEE_SHADOW_HIGH_BITDEPTH	= (1 << 10),
-	SCE_EEVEE_TAA_REPROJECTION		= (1 << 11),
-	SCE_EEVEE_SSS_ENABLED			= (1 << 12),
-	SCE_EEVEE_SSS_SEPARATE_ALBEDO	= (1 << 13),
-	SCE_EEVEE_SSR_ENABLED			= (1 << 14),
-	SCE_EEVEE_SSR_REFRACTION		= (1 << 15),
-	SCE_EEVEE_SSR_HALF_RESOLUTION	= (1 << 16),
-	SCE_EEVEE_SHOW_IRRADIANCE		= (1 << 17),
-	SCE_EEVEE_SHOW_CUBEMAPS			= (1 << 18),
-	SCE_EEVEE_GI_AUTOBAKE			= (1 << 19),
-	SCE_EEVEE_SHADOW_SOFT			= (1 << 20),
-	SCE_EEVEE_OVERSCAN				= (1 << 21),
+  SCE_EEVEE_VOLUMETRIC_ENABLED = (1 << 0),
+  SCE_EEVEE_VOLUMETRIC_LIGHTS = (1 << 1),
+  SCE_EEVEE_VOLUMETRIC_SHADOWS = (1 << 2),
+  //  SCE_EEVEE_VOLUMETRIC_COLORED    = (1 << 3), /* Unused */
+  SCE_EEVEE_GTAO_ENABLED = (1 << 4),
+  SCE_EEVEE_GTAO_BENT_NORMALS = (1 << 5),
+  SCE_EEVEE_GTAO_BOUNCE = (1 << 6),
+  SCE_EEVEE_DOF_ENABLED = (1 << 7),
+  SCE_EEVEE_BLOOM_ENABLED = (1 << 8),
+  SCE_EEVEE_MOTION_BLUR_ENABLED = (1 << 9),
+  SCE_EEVEE_SHADOW_HIGH_BITDEPTH = (1 << 10),
+  SCE_EEVEE_TAA_REPROJECTION = (1 << 11),
+  SCE_EEVEE_SSS_ENABLED = (1 << 12),
+  SCE_EEVEE_SSS_SEPARATE_ALBEDO = (1 << 13),
+  SCE_EEVEE_SSR_ENABLED = (1 << 14),
+  SCE_EEVEE_SSR_REFRACTION = (1 << 15),
+  SCE_EEVEE_SSR_HALF_RESOLUTION = (1 << 16),
+  SCE_EEVEE_SHOW_IRRADIANCE = (1 << 17),
+  SCE_EEVEE_SHOW_CUBEMAPS = (1 << 18),
+  SCE_EEVEE_GI_AUTOBAKE = (1 << 19),
+  SCE_EEVEE_SHADOW_SOFT = (1 << 20),
+  SCE_EEVEE_OVERSCAN = (1 << 21),
 };
 
 /* SceneEEVEE->shadow_method */
 enum {
-	SHADOW_ESM = 1,
-	SHADOW_VSM = 2,
-	SHADOW_METHOD_MAX = 3,
+  SHADOW_ESM = 1,
+  SHADOW_VSM = 2,
+  SHADOW_METHOD_MAX = 3,
 };
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* __DNA_SCENE_TYPES_H__ */
+#endif /* __DNA_SCENE_TYPES_H__ */