Revision: 46854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46854
Author: jbakker
Date: 2012-05-21 18:47:55 +0000 (Mon, 21 May 2012)
Log Message:
-----------
[#31410] Code review testing: The color correction node in particular is
quite problematic in button layout
* Added first column with labels
* increased max size of node
* moved the start/end midtones to the bottom of the node
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-21
18:35:31 UTC (rev 46853)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-21
18:47:55 UTC (rev 46854)
@@ -1984,10 +1984,15 @@
uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE);
row = uiLayoutRow(layout, 0);
- uiItemR(row, ptr, "midtones_start", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
- uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+ uiItemL(row, "", 0);
+ uiItemL(row, "Saturation", 0);
+ uiItemL(row, "Contrast", 0);
+ uiItemL(row, "Gamma", 0);
+ uiItemL(row, "Gain", 0);
+ uiItemL(row, "Lift", 0);
row = uiLayoutRow(layout, 0);
+ uiItemL(row, "Master", 0);
uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -1995,13 +2000,7 @@
uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
row = uiLayoutRow(layout, 0);
- uiItemL(row, "Saturation", 0);
- uiItemL(row, "Contrast", 0);
- uiItemL(row, "Gamma", 0);
- uiItemL(row, "Gain", 0);
- uiItemL(row, "Lift", 0);
-
- row = uiLayoutRow(layout, 0);
+ uiItemL(row, "Highlights", 0);
uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
@@ -2009,6 +2008,7 @@
uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
row = uiLayoutRow(layout, 0);
+ uiItemL(row, "Midtones", 0);
uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -2016,11 +2016,16 @@
uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
row = uiLayoutRow(layout, 0);
+ uiItemL(row, "Shadows", 0);
uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "shadows_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "shadows_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "shadows_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "midtones_start", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+ uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
}
static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr) {
uiLayout *row;
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
2012-05-21 18:35:31 UTC (rev 46853)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
2012-05-21 18:47:55 UTC (rev 46854)
@@ -81,7 +81,7 @@
node_type_base(ttype, &ntype, CMP_NODE_COLORCORRECTION, "Color
Correction", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_colorcorrection_in,
cmp_node_colorcorrection_out);
- node_type_size(&ntype, 400, 200, 400);
+ node_type_size(&ntype, 400, 200, 500);
node_type_init(&ntype, node_composit_init_colorcorrection);
node_type_storage(&ntype, "NodeColorCorrection",
node_free_standard_storage, node_copy_standard_storage);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
