diff options
| author | Thomas Dinges <blender@dingto.org> | 2009-07-30 20:38:00 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2009-07-30 20:38:00 +0400 |
| commit | 2f79219c07c60bcfdac9787710ed573d034e4ea3 (patch) | |
| tree | 36d31602fc6bb3ebc501f4d4a17f4db44ac6c93c /source/blender/makesrna | |
| parent | 20819ddcc9b1ef300d85a5fbbed6fafa86931a28 (diff) | |
2.5 Smoke:
* Put Smoke Modifier in the right alphabetical order in RNA and py file.
* Some small naming changes.
Commit approved by Genscher. :)
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 022ef56b53b..93e03808809 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -65,13 +65,13 @@ EnumPropertyItem modifier_type_items[] ={ {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""}, {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""}, {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""}, + {eModifierType_Smoke, "SMOKE", 0, "Smoke", ""}, {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, {eModifierType_Softbody, "SOFTBODY", ICON_MOD_SOFT, "Soft Body", ""}, {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subsurf", ""}, {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, {eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""}, {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, - {eModifierType_Smoke, "SMOKE", 0, "Smoke", ""}, {0, NULL, 0, NULL, NULL}}; @@ -1510,7 +1510,7 @@ static void rna_def_modifier_smoke(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "coll"); RNA_def_property_ui_text(prop, "Collision Settings", ""); - prop= RNA_def_property(srna, "fluid_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "smoke_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, prop_smoke_type_items); RNA_def_property_ui_text(prop, "Type", ""); |