Commit: 4d4222b7619de408ce0be3af667ed8cfdf729ebe
Author: William Reynish
Date: Thu Jan 2 20:54:24 2014 +0100
https://developer.blender.org/rB4d4222b7619de408ce0be3af667ed8cfdf729ebe
Changed percentage and 0-1 number fields to use sliders. This is more
consistent.
Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
===================================================================
M source/blender/editors/space_node/drawnode.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/composite/nodes/node_composite_alphaOver.c
M source/blender/nodes/composite/nodes/node_composite_colorSpill.c
M source/blender/nodes/composite/nodes/node_composite_colorbalance.c
M source/blender/nodes/composite/nodes/node_composite_curves.c
M source/blender/nodes/composite/nodes/node_composite_despeckle.c
M source/blender/nodes/composite/nodes/node_composite_filter.c
M source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
M source/blender/nodes/composite/nodes/node_composite_huecorrect.c
M source/blender/nodes/composite/nodes/node_composite_invert.c
M source/blender/nodes/composite/nodes/node_composite_mixrgb.c
M source/blender/nodes/composite/nodes/node_composite_valToRgb.c
M source/blender/nodes/shader/nodes/node_shader_attribute.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
M source/blender/nodes/shader/nodes/node_shader_bump.c
M source/blender/nodes/shader/nodes/node_shader_curves.c
M source/blender/nodes/shader/nodes/node_shader_fresnel.c
M source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
M source/blender/nodes/shader/nodes/node_shader_invert.c
M source/blender/nodes/shader/nodes/node_shader_mixRgb.c
M source/blender/nodes/shader/nodes/node_shader_mix_shader.c
M source/blender/nodes/shader/nodes/node_shader_tex_brick.c
M source/blender/nodes/shader/nodes/node_shader_tex_checker.c
M source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
M source/blender/nodes/shader/nodes/node_shader_tex_magic.c
M source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
M source/blender/nodes/shader/nodes/node_shader_tex_noise.c
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
M source/blender/nodes/shader/nodes/node_shader_tex_wave.c
M source/blender/nodes/shader/nodes/node_shader_valToRgb.c
M source/blender/nodes/shader/nodes/node_shader_wireframe.c
M source/blender/nodes/texture/nodes/node_texture_valToRgb.c
===================================================================
diff --git a/source/blender/editors/space_node/drawnode.c
b/source/blender/editors/space_node/drawnode.c
index 72caa46..7402096 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -139,7 +139,7 @@ static void node_buts_value(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *p
PointerRNA sockptr;
RNA_pointer_create(ptr->id.data, &RNA_NodeSocket, output, &sockptr);
- uiItemR(layout, &sockptr, "default_value", 0, "", ICON_NONE);
+ uiItemR(layout, &sockptr, "default_value", UI_ITEM_R_SLIDER, "",
ICON_NONE);
}
static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA
*ptr)
@@ -153,7 +153,7 @@ static void node_buts_rgb(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr
col = uiLayoutColumn(layout, FALSE);
uiTemplateColorPicker(col, &sockptr, "default_value", 1, 0, 0, 0);
- uiItemR(col, &sockptr, "default_value", 0, "", ICON_NONE);
+ uiItemR(col, &sockptr, "default_value", UI_ITEM_R_SLIDER, "",
ICON_NONE);
}
static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C),
PointerRNA *ptr)
@@ -830,7 +830,7 @@ static void node_shader_buts_tex_brick(uiLayout *layout,
bContext *UNUSED(C), Po
uiLayout *col;
col = uiLayoutColumn(layout, TRUE);
- uiItemR(col, ptr, "offset", 0, IFACE_("Offset"), ICON_NONE);
+ uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"),
ICON_NONE);
uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"),
ICON_NONE);
col = uiLayoutColumn(layout, TRUE);
@@ -2498,7 +2498,7 @@ static void node_texture_buts_bricks(uiLayout *layout,
bContext *UNUSED(C), Poin
uiLayout *col;
col = uiLayoutColumn(layout, TRUE);
- uiItemR(col, ptr, "offset", 0, IFACE_("Offset"), ICON_NONE);
+ uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"),
ICON_NONE);
uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"),
ICON_NONE);
col = uiLayoutColumn(layout, TRUE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index de002bd..eb01f47 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 38d7f05..f2faba9 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");
diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
index 5ba2e88..dda0ec0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
@@ -33,7 +33,7 @@
/* **************** ALPHAOVER ******************** */
static bNodeSocketTemplate cmp_node_alphaover_in[] = {
- { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f,
1.0f, 1.0f},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f,
1.0f, 1.0f},
{ -1, 0, "" }
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 529bba3..0d60875 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -34,7 +34,7 @@
/* ******************* Color Spill Supression
********************************* */
static bNodeSocketTemplate cmp_node_color_spill_in[] = {
{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_NONE},
+ {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_FACTOR},
{-1, 0, ""}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
index 5e7bbfa..65f2391 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
@@ -36,7 +36,7 @@
/* ******************* Color Balance ********************************* */
static bNodeSocketTemplate cmp_node_colorbalance_in[] = {
- {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_NONE},
+ {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
PROP_FACTOR},
{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{-1, 0, ""}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.c
b/source/blender/nodes/composite/nodes/node_composite_curves.c
index dadd97e..cd2e1f9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.c
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.c
@@ -95,7 +95,7 @@ void register_node_type_cmp_curve_vec(void)
/* **************** CURVE RGB ******************** */
static bNodeSocketTemplate cmp_node_curve_rgb_in[] = {
- { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, -1.0f,
1.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, -1.0f,
1.0f, PROP_FACTOR},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{ SOCK_RGBA, 1, N_("Black Level"), 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, N_("White Level"), 1.0f, 1.0f, 1.0f, 1.0f},
diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.c
b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
index 4368dd6..8b6c095 100644
--- a/source/blender/nodes/composite/nodes/node_composite_despeckle.c
+++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
@@ -33,7 +33,7 @@
/* **************** FILTER ******************** */
static bNodeSocketTemplate cmp_node_despeckle_in[] = {
- { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f,
1.0f, 1.0f},
{ -1, 0, "" }
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c
b/source/blender/nodes/composite/nodes/node_composite_filter.c
index 9eb13d5..f1c1861 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -34,7 +34,7 @@
/* **************** FILTER ******************** */
static bNodeSocketTemplate cmp_node_filter_in[] = {
- { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f,
1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f,
1.0f, 1.0f},
{ -1, 0, "" }
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
index 3bc18cf..1c31f48 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
@@ -35,7 +35,7 @@
/* **************** Hue Saturation ******************** */
static bNodeSocketTemplate cmp_node_hue_sat_in[] = {
- { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f,
0.0f, 0.0f, 0.0f
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
