[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55840] trunk/blender/source/blender/nodes : Node UI:
Thomas Dinges
blender at dingto.org
Sat Apr 6 14:07:43 CEST 2013
Revision: 55840
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55840
Author: dingto
Date: 2013-04-06 12:07:42 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Node UI:
* After PyNodes merge, many node sockets had sliders, instead of the arrow buttons (as the PROP_FACTOR subtype now actually was used). Change those back now, after artists feedback.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -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_FACTOR},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ 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, "" }
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -36,7 +36,7 @@
/* **************** BLUR ******************** */
static bNodeSocketTemplate cmp_node_blur_in[] = {
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_blur_out[] = {
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -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_FACTOR},
+ {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{-1, 0, ""}
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -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_FACTOR},
+ {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{-1, 0, ""}
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -38,7 +38,7 @@
/* ******************* Color Balance ********************************* */
static bNodeSocketTemplate cmp_node_colorcorrection_in[] = {
{ SOCK_RGBA,1,N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Mask"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Mask"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ -1,0,""}
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -34,8 +34,8 @@
/* **************** COMPOSITE ******************** */
static bNodeSocketTemplate cmp_node_composite_in[] = {
{ SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
- { SOCK_FLOAT, 1, N_("Z"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Z"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
{ -1, 0, "" }
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -95,7 +95,7 @@
/* **************** 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_FACTOR},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
{ 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},
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -36,7 +36,7 @@
/* ************ qdn: Defocus node ****************** */
static bNodeSocketTemplate cmp_node_defocus_in[] = {
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- { SOCK_FLOAT, 1, N_("Z"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Z"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_defocus_out[] = {
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -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_FACTOR},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{ -1, 0, "" }
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -36,7 +36,7 @@
/* **************** Dilate/Erode ******************** */
static bNodeSocketTemplate cmp_node_dilateerode_in[] = {
- { SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_dilateerode_out[] = {
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -38,8 +38,8 @@
static bNodeSocketTemplate cmp_node_displace_in[] = {
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{ SOCK_VECTOR, 1, N_("Vector"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
- { SOCK_FLOAT, 1, N_("X Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
- { SOCK_FLOAT, 1, N_("Y Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, N_("X Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, N_("Y Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_displace_out[] = {
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -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_FACTOR},
+ { SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
{ -1, 0, "" }
};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c 2013-04-06 11:52:40 UTC (rev 55839)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c 2013-04-06 12:07:42 UTC (rev 55840)
@@ -35,7 +35,7 @@
/* **************** Hue Saturation ******************** */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list