Revision: 46857
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46857
Author: mdewanchand
Date: 2012-05-21 19:58:23 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Fix for
[#31408] Code review testing: Button labels are invisible in many nodes
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-21
19:52:41 UTC (rev 46856)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-21
19:58:23 UTC (rev 46857)
@@ -2080,8 +2080,8 @@
uiLayout *row;
row= uiLayoutRow(layout, 1);
- uiItemR(row, ptr, "x", 0, "X", ICON_NONE);
- uiItemR(row, ptr, "y", 0, "Y", ICON_NONE);
+ uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
+ uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
row= uiLayoutRow(layout, 1);
uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -2207,8 +2207,8 @@
{
uiLayout *row;
row= uiLayoutRow(layout, 1);
- uiItemR(row, ptr, "x", 0, "X", ICON_NONE);
- uiItemR(row, ptr, "y", 0, "Y", ICON_NONE);
+ uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
+ uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
row= uiLayoutRow(layout, 1);
uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-21
19:52:41 UTC (rev 46856)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-21
19:58:23 UTC (rev 46857)
@@ -3023,28 +3023,28 @@
RNA_def_property_float_sdna(prop, NULL, "x");
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_range(prop, -1.0f, 2.0f);
- RNA_def_property_ui_text(prop, "X position", "X position of the middle
of the box");
+ RNA_def_property_ui_text(prop, "X", "X position of the middle of the
box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "y");
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_range(prop, -1.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Y position", "Y position of the middle
of the box");
+ RNA_def_property_ui_text(prop, "Y", "Y position of the middle of the
box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "width");
RNA_def_property_float_default(prop, 0.3f);
RNA_def_property_range(prop, 0.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Width of the box", "Width of the box");
+ RNA_def_property_ui_text(prop, "Width", "Width of the box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "height");
RNA_def_property_float_default(prop, 0.2f);
RNA_def_property_range(prop, 0.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Height of the box", "Height of the
box");
+ RNA_def_property_ui_text(prop, "Height", "Height of the box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_NONE);
@@ -3070,28 +3070,28 @@
RNA_def_property_float_sdna(prop, NULL, "x");
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_range(prop, -1.0f, 2.0f);
- RNA_def_property_ui_text(prop, "X position", "X position of the middle
of the box");
+ RNA_def_property_ui_text(prop, "X", "X position of the middle of the
box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "y");
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_range(prop, -1.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Y position", "Y position of the middle
of the box");
+ RNA_def_property_ui_text(prop, "Y", "Y position of the middle of the
box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "width");
RNA_def_property_float_default(prop, 0.3f);
RNA_def_property_range(prop, 0.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Width of the box", "Width of the box");
+ RNA_def_property_ui_text(prop, "Width", "Width of the box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "height");
RNA_def_property_float_default(prop, 0.2f);
RNA_def_property_range(prop, 0.0f, 2.0f);
- RNA_def_property_ui_text(prop, "Height of the box", "Height of the
box");
+ RNA_def_property_ui_text(prop, "Height", "Height of the box");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_NONE);
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
2012-05-21 19:52:41 UTC (rev 46856)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
2012-05-21 19:58:23 UTC (rev 46857)
@@ -63,7 +63,7 @@
node_type_base(ttype, &ntype, CMP_NODE_MASK_BOX, "Box Mask",
NODE_CLASS_MATTE, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_boxmask_in,
cmp_node_boxmask_out);
- node_type_size(&ntype, 120, 110, 160);
+ node_type_size(&ntype, 260, 110, 300);
node_type_init(&ntype, node_composit_init_boxmask);
node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage,
node_copy_standard_storage);
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
2012-05-21 19:52:41 UTC (rev 46856)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
2012-05-21 19:58:23 UTC (rev 46857)
@@ -63,7 +63,7 @@
node_type_base(ttype, &ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse Mask",
NODE_CLASS_MATTE, NODE_OPTIONS);
node_type_socket_templates(&ntype, cmp_node_ellipsemask_in,
cmp_node_ellipsemask_out);
- node_type_size(&ntype, 120, 110, 160);
+ node_type_size(&ntype, 260, 110, 300);
node_type_init(&ntype, node_composit_init_ellipsemask);
node_type_storage(&ntype, "NodeEllipseMask",
node_free_standard_storage, node_copy_standard_storage);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
