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/makesrna/intern/rna_texture.c | |
| 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/makesrna/intern/rna_texture.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index c352ec79735..f4b081b273e 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1726,6 +1726,12 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) {TEX_REPEAT, "REPEAT", 0, "Repeat", "Causes the image to repeat horizontally and vertically"}, {0, NULL, 0, NULL, NULL}}; + static EnumPropertyItem smoked_type_items[] = { + {TEX_VD_SMOKEDENSITY, "SMOKEDENSITY", 0, "Density", "Use smoke density as texture data."}, + {TEX_VD_SMOKEHEAT, "SMOKEHEAT", 0, "Heat", "Use smoke heat as texture data. Values from -2.0 to 2.0 are used."}, + {TEX_VD_SMOKEVEL, "SMOKEVEL", 0, "Velocity", "Use smoke velocity as texture data."}, + {0, NULL, 0, NULL, NULL}}; + srna= RNA_def_struct(brna, "VoxelData", NULL); RNA_def_struct_sdna(srna, "VoxelData"); RNA_def_struct_ui_text(srna, "VoxelData", "Voxel data settings."); @@ -1735,6 +1741,12 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_property_enum_items(prop, interpolation_type_items); RNA_def_property_ui_text(prop, "Interpolation", "Method to interpolate/smooth values between voxel cells"); RNA_def_property_update(prop, 0, "rna_Texture_update"); + + prop= RNA_def_property(srna, "smoke_data_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "smoked_type"); + RNA_def_property_enum_items(prop, smoked_type_items); + RNA_def_property_ui_text(prop, "Source", "Simulation value to be used as a texture."); + RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "extension", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "extend"); |