diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-22 21:35:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-22 21:35:00 +0400 |
commit | 749f027e1dd149db74a6d9e34f6df53b736812ba (patch) | |
tree | 1e4b8829c02e2995500525437074a49208543df7 | |
parent | 33acae1a15694d73490444a5f3e90fb6e9454841 (diff) |
rna rename start/end --> frame_start/end
-rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_particle.py | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 35a7f556214..888d20cb5e1 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -164,7 +164,7 @@ class DATA_PT_modifiers(DataButtonsPanel): split = layout.split() col = split.column() - col.prop(md, "start") + col.prop(md, "frame_start") col.prop(md, "length") if wide_ui: diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index f3ab64258d9..80a8a2036a8 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -160,8 +160,8 @@ class PARTICLE_PT_emission(ParticleButtonsPanel): split = layout.split() col = split.column(align=True) - col.prop(part, "start") - col.prop(part, "end") + col.prop(part, "frame_start") + col.prop(part, "frame_end") col = split.column(align=True) col.prop(part, "lifetime") diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index ab93e972e65..26ba3f003d4 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -685,7 +685,8 @@ static void rna_def_modifier_build(BlenderRNA *brna) RNA_def_struct_sdna(srna, "BuildModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_BUILD); - prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME); + RNA_def_property_float_sdna(prop, NULL, "start"); RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start", "Specify the start frame of the effect"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 4e728d57290..4347c17fc96 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1443,7 +1443,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Rate", "Speed of Simplification"); /* general values */ - prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sta");//optional if prop names are the same RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); @@ -1451,7 +1451,8 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Start", "Frame # to start emitting particles"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "end", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "end"); RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); |