[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25815] trunk/blender/source/blender: * Use color wheel template for RGB node
Matt Ebb
matt at mke3.net
Thu Jan 7 23:43:01 CET 2010
Revision: 25815
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25815
Author: broken
Date: 2010-01-07 23:42:59 +0100 (Thu, 07 Jan 2010)
Log Message:
-----------
* Use color wheel template for RGB node
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2010-01-07 21:58:28 UTC (rev 25814)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2010-01-07 22:42:59 UTC (rev 25815)
@@ -1868,14 +1868,16 @@
{
PropertyRNA *prop= RNA_struct_find_property(ptr, propname);
uiBlock *block= uiLayoutGetBlock(layout);
- uiLayout *row;
+ uiLayout *col, *row;
+ uiBut *but;
if (!prop) {
printf("uiTemplateColorWheel: property not found: %s\n", propname);
return;
}
- row= uiLayoutRow(layout, 1);
+ col = uiLayoutColumn(layout, 0);
+ row= uiLayoutRow(col, 1);
uiDefButR(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, propname, -1, 0.0, 0.0, 0, 0, "");
@@ -1884,6 +1886,13 @@
if (value_slider)
uiDefButR(block, HSVCUBE, 0, "", WHEEL_SIZE+6, 0, 14, WHEEL_SIZE, ptr, propname, -1, 0.0, 0.0, 4, 0, "");
+ /* maybe a switch for this?
+ row= uiLayoutRow(col, 0);
+ if(ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA) && RNA_property_array_length(ptr, prop) == 4) {
+ but= uiDefAutoButR(block, ptr, prop, 3, "A:", 0, 0, 0, WHEEL_SIZE+20, UI_UNIT_Y);
+ }
+ */
+
}
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2010-01-07 21:58:28 UTC (rev 25814)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2010-01-07 22:42:59 UTC (rev 25815)
@@ -166,6 +166,7 @@
RNA_property_collection_lookup_int(ptr, prop, 0, &sockptr);
col = uiLayoutColumn(layout, 0);
+ uiTemplateColorWheel(col, &sockptr, "default_value", 1);
uiItemR(col, "", 0, &sockptr, "default_value", 0);
}
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c 2010-01-07 21:58:28 UTC (rev 25814)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c 2010-01-07 22:42:59 UTC (rev 25815)
@@ -47,7 +47,7 @@
/* *next,*prev */ NULL, NULL,
/* type code */ CMP_NODE_RGB,
/* name */ "RGB",
- /* width+range */ 100, 60, 140,
+ /* width+range */ 140, 80, 140,
/* class+opts */ NODE_CLASS_INPUT, NODE_OPTIONS,
/* input sock */ NULL,
/* output sock */ cmp_node_rgb_out,
Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c 2010-01-07 21:58:28 UTC (rev 25814)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c 2010-01-07 22:42:59 UTC (rev 25815)
@@ -54,7 +54,7 @@
/* *next,*prev */ NULL, NULL,
/* type code */ SH_NODE_RGB,
/* name */ "RGB",
- /* width+range */ 100, 60, 140,
+ /* width+range */ 140, 80, 140,
/* class+opts */ NODE_CLASS_INPUT, NODE_OPTIONS,
/* input sock */ NULL,
/* output sock */ sh_node_rgb_out,
More information about the Bf-blender-cvs
mailing list