diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 05:59:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 06:01:55 +0400 |
| commit | cc9372b7e0f848405e37d51587916c4ec7f636a3 (patch) | |
| tree | 514131229d0c834a05f933e1463e089b7375d8ed /source/blender/makesdna/DNA_smoke_types.h | |
| parent | 96f95e02233d21129860c9a163bf284039c7c89f (diff) | |
DNA Deprecation: add DNA_DEPRECATED_GCC_POISON for enum/structs.
also fully remove freestyle raycasting_algorithm
Diffstat (limited to 'source/blender/makesdna/DNA_smoke_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index d01eceb44f0..25c98b4f07e 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -33,13 +33,19 @@ #define __DNA_SMOKE_TYPES_H__ /* flags */ -#define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */ -#define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */ -#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */ - -#define MOD_SMOKE_HIGH_SMOOTH (1<<5) /* -- Deprecated -- */ -#define MOD_SMOKE_FILE_LOAD (1<<6) /* flag for file load */ -#define MOD_SMOKE_ADAPTIVE_DOMAIN (1<<7) +enum { + MOD_SMOKE_HIGHRES = (1 << 1), /* enable high resolution */ + MOD_SMOKE_DISSOLVE = (1 << 2), /* let smoke dissolve */ + MOD_SMOKE_DISSOLVE_LOG = (1 << 3), /* using 1/x for dissolve */ + + MOD_SMOKE_HIGH_SMOOTH = (1 << 5), /* -- Deprecated -- */ + MOD_SMOKE_FILE_LOAD = (1 << 6), /* flag for file load */ + MOD_SMOKE_ADAPTIVE_DOMAIN = (1 << 7), +}; + +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison MOD_SMOKE_HIGH_SMOOTH +#endif /* noise */ #define MOD_SMOKE_NOISEWAVE (1<<0) |