diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_world_types.h | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 84050894faa..38bfb20581b 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -50,7 +50,7 @@ struct MTex; * gravity, color model etc. It mixes rendering data and modeling data. */ typedef struct World { ID id; - struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ char _pad0[4]; short texact, mistype; @@ -64,7 +64,7 @@ typedef struct World { */ float exposure, exp, range; float linfac, logfac; - + /** * Some world modes * bit 0: Do mist @@ -76,10 +76,10 @@ typedef struct World { /* ambient occlusion */ float aodist, aoenergy; - + /* assorted settings */ short flag, pad3[3]; - + struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ short pr_texture, use_nodes, pad; short update_flag; /* XXX temporary flag waiting for depsgraph proper tagging */ @@ -114,7 +114,7 @@ enum { /* flag */ #define WO_DS_EXPAND (1<<0) - /* NOTE: this must have the same value as MA_DS_SHOW_TEXS, + /* 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) |