diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2010-01-25 18:10:14 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2010-01-25 18:10:14 +0300 |
| commit | 83dfade37a746043dfc8d38f57514706d8505352 (patch) | |
| tree | 71d291a00799e67ecc6d39a5c5fc2117037a1328 /source/blender/makesdna/DNA_texture_types.h | |
| parent | 4b71eaa4d14af6f43c15f97d8bf70506afad724b (diff) | |
Smoke: The well known Miika Hämäläinen (aka MiikaH) patch (http://blenderartists.org/forum/showthread.php?t=158317&page=42)
* Better (and windows enabled) OpenMP handling (> 2x-5x speed)
* More Volumetric Texture mapping options (heat, etc) <-- Matt if that's not to your liking, just revert that part, it's separate anyway
* Initial velocity taken from particle settings (no more slow starting)
* Option to select compression method (there seem to be a bug in my high compression usage, at least it's been reported to result in exploding smoke - better use low compression for the time being)
It's been tested since a while but as usual please report any (new!) bugs. ;-)
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index eac7a97f0c0..76651cbc551 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -184,7 +184,7 @@ typedef struct VoxelData { short file_format; short flag; short extend; - short pad; + short smoked_type; struct Object *object; /* for rendering smoke sims */ float int_multiplier; @@ -546,5 +546,10 @@ typedef struct TexMapping { #define TEX_VD_IMAGE_SEQUENCE 3 #define TEX_VD_SMOKE 4 +/* smoke data types */ +#define TEX_VD_SMOKEDENSITY 0 +#define TEX_VD_SMOKEHEAT 1 +#define TEX_VD_SMOKEVEL 2 + #endif |