[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54587] trunk/blender: And more UI messages issues fixing...
Bastien Montagne
montagne29 at wanadoo.fr
Fri Feb 15 19:19:20 CET 2013
Revision: 54587
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54587
Author: mont29
Date: 2013-02-15 18:19:20 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
And more UI messages issues fixing... Thanks again to Gabriel Gazz?\195?\161n and Leon Cheung!
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-02-15 16:56:42 UTC (rev 54586)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-02-15 18:19:20 UTC (rev 54587)
@@ -368,7 +368,10 @@
# Other py files that should be searched for ui strings, relative to SOURCE_DIR.
# Needed for Cycles, currently...
-CUSTOM_PY_UI_FILES = [os.path.join("intern", "cycles", "blender", "addon", "ui.py"),]
+CUSTOM_PY_UI_FILES = [
+ os.path.join("intern", "cycles", "blender", "addon", "ui.py"),
+ os.path.join("release", "scripts", "modules", "rna_prop_ui.py"),
+]
# A cache storing validated msgids, to avoid re-spellchecking them.
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2013-02-15 16:56:42 UTC (rev 54586)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2013-02-15 18:19:20 UTC (rev 54587)
@@ -148,7 +148,7 @@
if use_edit:
row = split.row(align=True)
- props = row.operator("wm.properties_edit", text="edit")
+ props = row.operator("wm.properties_edit", text="Edit")
assign_props(props, val_draw, key)
props = row.operator("wm.properties_remove", text="", icon='ZOOMOUT')
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h 2013-02-15 16:56:42 UTC (rev 54586)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h 2013-02-15 18:19:20 UTC (rev 54587)
@@ -52,7 +52,7 @@
DefNode( ShaderNode, SH_NODE_CAMERA, 0, "CAMERA", CameraData, "Camera Data", "" )
DefNode( ShaderNode, SH_NODE_MATH, def_math, "MATH", Math, "Math", "" )
DefNode( ShaderNode, SH_NODE_VECT_MATH, def_vector_math, "VECT_MATH", VectorMath, "Vector Math", "" )
-DefNode( ShaderNode, SH_NODE_SQUEEZE, 0, "SQUEEZE", Squeeze, "Squeeze", "" )
+DefNode( ShaderNode, SH_NODE_SQUEEZE, 0, "SQUEEZE", Squeeze, "Squeeze Value", "" )
DefNode( ShaderNode, SH_NODE_MATERIAL_EXT, def_sh_material, "MATERIAL_EXT", ExtendedMaterial, "Extended Material", "" )
DefNode( ShaderNode, SH_NODE_INVERT, 0, "INVERT", Invert, "Invert", "" )
DefNode( ShaderNode, SH_NODE_SEPRGB, 0, "SEPRGB", SeparateRGB, "Separate RGB", "" )
@@ -205,8 +205,8 @@
DefNode( TextureNode, TEX_NODE_TRANSLATE, 0, "TRANSLATE", Translate, "Translate", "" )
DefNode( TextureNode, TEX_NODE_COORD, 0, "COORD", Coordinates, "Coordinates", "" )
DefNode( TextureNode, TEX_NODE_DISTANCE, 0, "DISTANCE", Distance, "Distance", "" )
-DefNode( TextureNode, TEX_NODE_COMPOSE, 0, "COMPOSE", Compose, "Compose", "" )
-DefNode( TextureNode, TEX_NODE_DECOMPOSE, 0, "DECOMPOSE", Decompose, "Decompose", "" )
+DefNode( TextureNode, TEX_NODE_COMPOSE, 0, "COMPOSE", Compose, "Combine RGBA", "" )
+DefNode( TextureNode, TEX_NODE_DECOMPOSE, 0, "DECOMPOSE", Decompose, "Separate RGBA", "" )
DefNode( TextureNode, TEX_NODE_VALTONOR, 0, "VALTONOR", ValToNor, "Value to Normal", "" )
DefNode( TextureNode, TEX_NODE_SCALE, 0, "SCALE", Scale, "Scale", "" )
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c 2013-02-15 16:56:42 UTC (rev 54586)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c 2013-02-15 18:19:20 UTC (rev 54587)
@@ -61,7 +61,7 @@
{
static bNodeType ntype;
- node_type_base(ttype, &ntype, TEX_NODE_COMPOSE, "Compose RGBA", NODE_CLASS_OP_COLOR, 0);
+ node_type_base(ttype, &ntype, TEX_NODE_COMPOSE, "Combine RGBA", NODE_CLASS_OP_COLOR, 0);
node_type_socket_templates(&ntype, inputs, outputs);
node_type_size(&ntype, 100, 60, 150);
node_type_exec(&ntype, exec);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c 2013-02-15 16:56:42 UTC (rev 54586)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c 2013-02-15 18:19:20 UTC (rev 54587)
@@ -82,7 +82,7 @@
{
static bNodeType ntype;
- node_type_base(ttype, &ntype, TEX_NODE_DECOMPOSE, "Decompose RGBA", NODE_CLASS_OP_COLOR, 0);
+ node_type_base(ttype, &ntype, TEX_NODE_DECOMPOSE, "Separate RGBA", NODE_CLASS_OP_COLOR, 0);
node_type_socket_templates(&ntype, inputs, outputs);
node_type_size(&ntype, 100, 60, 150);
node_type_exec(&ntype, exec);
More information about the Bf-blender-cvs
mailing list