Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_world_types.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
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
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
-rw-r--r--source/blender/makesdna/DNA_world_types.h137
1 files changed, 68 insertions, 69 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index ca7b22d5ec3..a1771693005 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -33,90 +33,89 @@ struct MTex;
struct bNodeTree;
#ifndef MAX_MTEX
-#define MAX_MTEX 18
+# define MAX_MTEX 18
#endif
-
/**
* World defines general modeling data such as a background fill,
* gravity, color model etc. It mixes rendering data and modeling data. */
typedef struct World {
- ID id;
- /** Animation data (must be immediately after id for utilities to use it). */
- struct AnimData *adt;
- /* runtime (must be immediately after id for utilities to use it). */
- DrawDataList drawdata;
-
- char _pad0[4];
- short texact, mistype;
-
- float horr, horg, horb;
-
- /**
- * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat.
- * New is exp/range control. linfac & logfac are constants... don't belong in
- * file, but allocating 8 bytes for temp mem isn't useful either.
- */
- float exposure, exp, range;
- float linfac, logfac;
-
- /**
- * Some world modes
- * bit 0: Do mist
- */
- short mode;
- char _pad2[6];
-
- float misi, miststa, mistdist, misthi;
-
- /** Ambient occlusion. */
- float aodist, aoenergy;
-
- /** Assorted settings. */
- short flag;
- char _pad3[6];
-
- /** Old animation system, deprecated for 2.5. */
- struct Ipo *ipo DNA_DEPRECATED;
- short pr_texture, use_nodes;
- char _pad[4];
-
- /* previews */
- struct PreviewImage *preview;
-
- /* nodes */
- struct bNodeTree *nodetree;
-
- /** Runtime : miststa + mistdist, used for drawing camera. */
- float mistend;
- char _pad1[4];
- /** Runtime. */
- ListBase gpumaterial;
+ ID id;
+ /** Animation data (must be immediately after id for utilities to use it). */
+ struct AnimData *adt;
+ /* runtime (must be immediately after id for utilities to use it). */
+ DrawDataList drawdata;
+
+ char _pad0[4];
+ short texact, mistype;
+
+ float horr, horg, horb;
+
+ /**
+ * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat.
+ * New is exp/range control. linfac & logfac are constants... don't belong in
+ * file, but allocating 8 bytes for temp mem isn't useful either.
+ */
+ float exposure, exp, range;
+ float linfac, logfac;
+
+ /**
+ * Some world modes
+ * bit 0: Do mist
+ */
+ short mode;
+ char _pad2[6];
+
+ float misi, miststa, mistdist, misthi;
+
+ /** Ambient occlusion. */
+ float aodist, aoenergy;
+
+ /** Assorted settings. */
+ short flag;
+ char _pad3[6];
+
+ /** Old animation system, deprecated for 2.5. */
+ struct Ipo *ipo DNA_DEPRECATED;
+ short pr_texture, use_nodes;
+ char _pad[4];
+
+ /* previews */
+ struct PreviewImage *preview;
+
+ /* nodes */
+ struct bNodeTree *nodetree;
+
+ /** Runtime : miststa + mistdist, used for drawing camera. */
+ float mistend;
+ char _pad1[4];
+ /** Runtime. */
+ ListBase gpumaterial;
} World;
/* **************** WORLD ********************* */
/* mode */
-#define WO_MIST (1 << 0)
-#define WO_MODE_UNUSED_1 (1 << 1) /* cleared */
-#define WO_MODE_UNUSED_2 (1 << 2) /* cleared */
-#define WO_MODE_UNUSED_3 (1 << 3) /* cleared */
-#define WO_MODE_UNUSED_4 (1 << 4) /* cleared */
-#define WO_MODE_UNUSED_5 (1 << 5) /* cleared */
-#define WO_AMB_OCC (1 << 6)
-#define WO_MODE_UNUSED_7 (1 << 7) /* cleared */
+#define WO_MIST (1 << 0)
+#define WO_MODE_UNUSED_1 (1 << 1) /* cleared */
+#define WO_MODE_UNUSED_2 (1 << 2) /* cleared */
+#define WO_MODE_UNUSED_3 (1 << 3) /* cleared */
+#define WO_MODE_UNUSED_4 (1 << 4) /* cleared */
+#define WO_MODE_UNUSED_5 (1 << 5) /* cleared */
+#define WO_AMB_OCC (1 << 6)
+#define WO_MODE_UNUSED_7 (1 << 7) /* cleared */
enum {
- WO_MIST_QUADRATIC = 0,
- WO_MIST_LINEAR = 1,
- WO_MIST_INVERSE_QUADRATIC = 2,
+ WO_MIST_QUADRATIC = 0,
+ WO_MIST_LINEAR = 1,
+ WO_MIST_INVERSE_QUADRATIC = 2,
};
/* flag */
-#define WO_DS_EXPAND (1 << 0)
- /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
- * otherwise anim-editors will not read correctly
- */
-#define WO_DS_SHOW_TEXS (1 << 2)
+#define WO_DS_EXPAND (1 << 0)
+/* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
+ * otherwise anim-editors will not read correctly
+ */
+#define WO_DS_SHOW_TEXS (1 << 2)
#endif