Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Reynish <william@reynish.com>2014-01-02 23:54:24 +0400
committerWilliam Reynish <william@reynish.com>2014-01-04 00:12:56 +0400
commit4d4222b7619de408ce0be3af667ed8cfdf729ebe (patch)
treee5d9dcb16bf596a021a13f056f1540ff98a75e13 /source/blender/makesrna/intern
parent975c048ecd3dc2fc4a391709696bcca5239448cf (diff)
Changed percentage and 0-1 number fields to use sliders. This is more consistent.
Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c8
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index de002bdfd2c..eb01f47098f 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1191,7 +1191,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* (mode == MOD_DECIM_MODE_COLLAPSE) */
- prop = RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "percent");
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_range(prop, 0, 1, 1, 4);
@@ -2937,7 +2937,7 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna), StructRNA *
PropertyRNA *prop;
- prop = RNA_def_property(srna, "mask_constant", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "mask_constant", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
RNA_def_property_ui_text(prop, "Influence", "Global influence of current modifications on vgroup");
@@ -3027,7 +3027,7 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
"from vgroup");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop = RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 1.0f);
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
RNA_def_property_ui_text(prop, "Default Weight", "Default weight a vertex will have if "
@@ -3478,7 +3478,7 @@ static void rna_def_modifier_skin(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SkinModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SKIN);
- prop = RNA_def_property(srna, "branch_smoothing", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "branch_smoothing", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_ui_text(prop, "Branch Smoothing", "Smooth complex geometry around branches");
RNA_def_property_ui_range(prop, 0, 1, 1, -1);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 38d7f051b0b..f2faba9b434 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3335,7 +3335,7 @@ static void def_sh_tex_sky(StructRNA *srna)
RNA_def_property_ui_text(prop, "Turbidity", "Atmospheric turbidity");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
- prop = RNA_def_property(srna, "ground_albedo", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "ground_albedo", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ground Albedo", "Ground color that is subtly reflected in the sky");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
@@ -3861,7 +3861,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
RNA_def_struct_sdna_from(srna, "NodeTwoFloats", "storage");
- prop = RNA_def_property(srna, "premul", PROP_FLOAT, PROP_NONE);
+ prop = RNA_def_property(srna, "premul", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "x");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Premul", "Mix Factor");