diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 667e7bd6408..c6f97e11156 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -743,34 +743,6 @@ static void rna_OceanModifier_ocean_chop_set(PointerRNA *ptr, float value) } } -static float rna_EdgeSplitModifier_split_angle_get(PointerRNA *ptr) -{ - EdgeSplitModifierData *md = (EdgeSplitModifierData *)ptr->data; - return DEG2RADF(md->split_angle); -} - -static void rna_EdgeSplitModifier_split_angle_set(PointerRNA *ptr, float value) -{ - EdgeSplitModifierData *md = (EdgeSplitModifierData *)ptr->data; - value = RAD2DEGF(value); - CLAMP(value, 0.0f, 180.0f); - md->split_angle = (int)value; -} - -static float rna_BevelModifier_angle_limit_get(PointerRNA *ptr) -{ - BevelModifierData *md = (BevelModifierData *)ptr->data; - return DEG2RADF(md->bevel_angle); -} - -static void rna_BevelModifier_angle_limit_set(PointerRNA *ptr, float value) -{ - BevelModifierData *md = (BevelModifierData *)ptr->data; - value = RAD2DEGF(value); - CLAMP(value, 0.0f, 180.0f); - md->bevel_angle = (int)value; -} - static void rna_BevelModifier_defgrp_name_set(PointerRNA *ptr, const char *value) { BevelModifierData *md = (BevelModifierData *)ptr->data; @@ -1668,17 +1640,9 @@ static void rna_def_modifier_edgesplit(BlenderRNA *brna) RNA_def_struct_sdna(srna, "EdgeSplitModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT); -#if 1 /* expose as radians */ prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_funcs(prop, "rna_EdgeSplitModifier_split_angle_get", - "rna_EdgeSplitModifier_split_angle_set", NULL); - RNA_def_property_range(prop, 0, DEG2RAD(180)); - RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 100, 2); -#else - prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, 0, 180); - RNA_def_property_ui_range(prop, 0, 180, 100, 2); -#endif + RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f)); + RNA_def_property_ui_range(prop, 0.0f, DEG2RADF(180.0f), 100, 2); RNA_def_property_ui_text(prop, "Split Angle", "Angle above which to split edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2394,10 +2358,9 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_funcs(prop, "rna_BevelModifier_angle_limit_get", - "rna_BevelModifier_angle_limit_set", NULL); - RNA_def_property_range(prop, 0, DEG2RAD(180)); - RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 100, 2); + RNA_def_property_float_sdna(prop, NULL, "bevel_angle"); + RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f)); + RNA_def_property_ui_range(prop, 0.0f, DEG2RADF(180.0f), 100, 2); RNA_def_property_ui_text(prop, "Angle", "Angle above which to bevel edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); |