diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-31 07:12:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-31 07:12:20 +0300 |
| commit | 55934366521da478ad8f4674152c00742c2f5f1e (patch) | |
| tree | 52413cd412034e70536d885dac6f69d8c0cbea68 /source/blender/makesrna/intern/rna_fcurve.c | |
| parent | a8406439938d3eb405c144a50d87100f48f77c7e (diff) | |
Continue from my commit r33952, which disallowed floats to be wrapped as ints.
this missed some cases, now also disallow ints to be wrapped as floats.
This commit also exposed a number of cases where ints/floats were incorrectly wrapped.
Bugs like [#25416] wont slip through the cracks anymore.
Diffstat (limited to 'source/blender/makesrna/intern/rna_fcurve.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index b3c5f74ab84..af98f6792e4 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -747,8 +747,8 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Before Mode", "Cycling mode to use before first keyframe"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "cycles_before", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "before_cycles"); + prop= RNA_def_property(srna, "cycles_before", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "before_cycles"); RNA_def_property_ui_text(prop, "Before Cycles", "Maximum number of cycles to allow before first keyframe. (0 = infinite)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); @@ -759,8 +759,8 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna) RNA_def_property_ui_text(prop, "After Mode", "Cycling mode to use after last keyframe"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "cycles_after", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "after_cycles"); + prop= RNA_def_property(srna, "cycles_after", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "after_cycles"); RNA_def_property_ui_text(prop, "After Cycles", "Maximum number of cycles to allow after last keyframe. (0 = infinite)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); } |