From 262a76812e132f57b8aa5eece17b1bad5889ec73 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Sun, 2 Aug 2009 23:30:44 +0000 Subject: Smoke: a) fixing domain boundaries b) fixing flow gui (no more velocity there - taken from particles) c) Outflow available (deletes smoke from scene) d) deactivating other noise options for now e) base for render/preview settings f) fixing collisions to be working again --- source/blender/makesrna/intern/rna_smoke.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index a4e2c39ecd8..cedbc992dde 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -118,8 +118,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) static EnumPropertyItem prop_noise_type_items[] = { {MOD_SMOKE_NOISEWAVE, "NOISEWAVE", 0, "Wavelet", ""}, - {MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, - {MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, + /* {MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, */ + /* {MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */ {0, NULL, 0, NULL, NULL}}; srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL); @@ -129,8 +129,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) prop= RNA_def_property(srna, "maxres", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxres"); - RNA_def_property_range(prop, 32, 512); - RNA_def_property_ui_range(prop, 32, 512, 2, 0); + RNA_def_property_range(prop, 24, 512); + RNA_def_property_ui_range(prop, 24, 512, 2, 0); RNA_def_property_ui_text(prop, "Max Res", "Maximal resolution used in the fluid domain."); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset"); @@ -233,13 +233,10 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Particle Systems", "Particle systems emitted from the object."); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_dependancy"); - prop= RNA_def_property(srna, "velocity", PROP_FLOAT, PROP_VECTOR); - RNA_def_property_float_sdna(prop, NULL, "velocity"); - RNA_def_property_range(prop, -10, 10); - RNA_def_property_ui_range(prop, -10, 10, 1, 1); - RNA_def_property_ui_text(prop, "Velocity", ""); + prop= RNA_def_property(srna, "outflow", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "type", MOD_SMOKE_FLOW_TYPE_OUTFLOW); + RNA_def_property_ui_text(prop, "Outflow", "Deletes smoke from simulation"); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, NULL); - } static void rna_def_smoke_coll_settings(BlenderRNA *brna) -- cgit v1.2.3