diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
| commit | 9149e8942107343fb31639406124428e6ff1a029 (patch) | |
| tree | d33495dc55c5d50206437598ddcfffa24843be61 /source/blender/makesdna/DNA_world_types.h | |
| parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
| parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) | |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 7769833a835..82ebef4b978 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -97,14 +97,14 @@ typedef struct World { /* **************** WORLD ********************* */ /* mode */ -#define WO_MIST 1 -//#define WO_STARS 2 /* deprecated */ -/*#define WO_DOF 4*/ -//#define WO_ACTIVITY_CULLING 8 /* deprecated */ -//#define WO_ENV_LIGHT 16 -//#define WO_DBVT_CULLING 32 /* deprecated */ -#define WO_AMB_OCC 64 -//#define WO_INDIRECT_LIGHT 128 +#define WO_MIST (1 << 0) +//#define WO_STARS (1 << 1) /* deprecated */ +/*#define WO_DOF (1 << 2)*/ +//#define WO_ACTIVITY_CULLING (1 << 3) /* deprecated */ +//#define WO_ENV_LIGHT (1 << 4) +//#define WO_DBVT_CULLING (1 << 5) /* deprecated */ +#define WO_AMB_OCC (1 << 6) +//#define WO_INDIRECT_LIGHT (1 << 7) enum { WO_MIST_QUADRATIC = 0, |