diff options
author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
---|---|---|
committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/makesrna/intern/rna_modifier.c | |
parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 65 |
1 files changed, 19 insertions, 46 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 6c22a5cd5a4..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; @@ -798,7 +770,7 @@ static void rna_LaplacianDeformModifier_vgroup_set(PointerRNA *ptr, const char * static int rna_LaplacianDeformModifier_is_bind_get(PointerRNA *ptr) { LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)ptr->data; - return ((lmd->flag & MOD_LAPLACIANDEFORM_BIND) && (lmd->cacheSystem != NULL)); + return ((lmd->flag & MOD_LAPLACIANDEFORM_BIND) && (lmd->cache_system != NULL)); } #else @@ -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"); @@ -2853,6 +2816,16 @@ static void rna_def_modifier_screw(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Smooth Shading", "Output faces with smooth shading rather than flat shaded"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); + prop = RNA_def_property(srna, "use_stretch_u", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_U); + RNA_def_property_ui_text(prop, "Stretch U", "Stretch the U coordinates between 0-1 when UV's are present"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); + + prop = RNA_def_property(srna, "use_stretch_v", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_V); + RNA_def_property_ui_text(prop, "Stretch V", "Stretch the V coordinates between 0-1 when UV's are present"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); + #if 0 prop = RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE); @@ -3700,12 +3673,12 @@ static void rna_def_modifier_laplaciandeform(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - + srna = RNA_def_struct(brna, "LaplacianDeformModifier", "Modifier"); RNA_def_struct_ui_text(srna, "Laplacian Deform Modifier", "Mesh deform modifier"); RNA_def_struct_sdna(srna, "LaplacianDeformModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM); - + prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "anchor_grp_name"); RNA_def_property_ui_text(prop, "Vertex Group for Anchors", @@ -3720,7 +3693,7 @@ static void rna_def_modifier_laplaciandeform(BlenderRNA *brna) prop = RNA_def_property(srna, "is_bind", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LaplacianDeformModifier_is_bind_get", NULL); - RNA_def_property_ui_text(prop, "Bind", "Whether geometry has been bind to anchors"); + RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to anchors"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, 0, "rna_Modifier_update"); |