[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42173] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 42170.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Nov 26 17:15:38 CET 2011
Revision: 42173
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42173
Author: kjym3
Date: 2011-11-26 16:15:32 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 42170.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42170
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:34011-39896,39898-40096,40098-42166
+ /branches/soc-2011-cucumber:37517
/trunk/blender:34011-39896,39898-40096,40098-42170
Modified: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-26 16:15:32 UTC (rev 42173)
@@ -36,9 +36,9 @@
layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT')
layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True
layout.separator()
- layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock All").action = 'SELECT'
- layout.operator("object.vertex_group_lock", icon='UNLOCK', text="UnLock All").action = 'DESELECT'
- layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock Invert All").action = 'INVERT'
+ layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock All").action = 'SELECT'
+ layout.operator("object.vertex_group_lock", icon='UNLOCKED', text="UnLock All").action = 'DESELECT'
+ layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock Invert All").action = 'INVERT'
class MESH_MT_shape_key_specials(Menu):
Property changes on: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-39896,40098-42166
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-39896,40098-42170
Modified: branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c 2011-11-26 16:15:32 UTC (rev 42173)
@@ -370,6 +370,7 @@
NULL, 0.0, 0.0, 0.0, 0.0, "Add node to input");
argN = MEM_dupallocN(arg);
+ argN->type = NODE_GROUP;
argN->ngroup = ngroup;
argN->output = i;
uiButSetNFunc(but, ui_node_link, argN, NULL);
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c 2011-11-26 16:15:32 UTC (rev 42173)
@@ -849,7 +849,7 @@
prop= RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_STRETCH);
- RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: makes deformed child to stretch along entire path");
+ RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: make deformed child to stretch along entire path");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop= RNA_def_property(srna, "use_deform_bounds", PROP_BOOLEAN, PROP_NONE);
@@ -973,12 +973,12 @@
/* strings */
prop= RNA_def_property(srna, "family", PROP_STRING, PROP_NONE);
RNA_def_property_string_maxlength(prop, MAX_ID_NAME-2);
- RNA_def_property_ui_text(prop, "Object Font", "Use Blender Objects as font characters. Give font objects a common name followed by the character it represents, eg. familya, familyb etc, and turn on Verts Duplication");
+ RNA_def_property_ui_text(prop, "Object Font", "Use Blender Objects as font characters (give font objects a common name followed by the character they represent, eg. familya, familyb, etc, and turn on Verts Duplication)");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop= RNA_def_property(srna, "body", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "str");
- RNA_def_property_ui_text(prop, "Body Text", "contents of this text object");
+ RNA_def_property_ui_text(prop, "Body Text", "Content of this text object");
RNA_def_property_string_funcs(prop, "rna_Curve_body_get", "rna_Curve_body_length", "rna_Curve_body_set");
RNA_def_property_string_maxlength(prop, 8192); /* note that originally str did not have a limit! */
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
@@ -1239,7 +1239,7 @@
{0, NULL, 0, NULL, NULL}};
static const EnumPropertyItem curve_axis_items[]= {
- {0, "2D", 0, "2D", "Clamp the Z axis of of the curve"},
+ {0, "2D", 0, "2D", "Clamp the Z axis of the curve"},
{CU_3D, "3D", 0, "3D", "Allow editing on the Z axis of this curve, also allows tilt and curve radius to be used"},
{0, NULL, 0, NULL, NULL}};
@@ -1324,18 +1324,18 @@
RNA_def_property_int_sdna(prop, NULL, "resolu_ren");
RNA_def_property_range(prop, 0, SHRT_MAX);
RNA_def_property_ui_range(prop, 0, 64, 1, 0);
- RNA_def_property_ui_text(prop, "Render Resolution U", "Surface resolution in U direction used while rendering. Zero skips this property");
+ RNA_def_property_ui_text(prop, "Render Resolution U", "Surface resolution in U direction used while rendering (zero skips this property)");
prop= RNA_def_property(srna, "render_resolution_v", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "resolv_ren");
RNA_def_property_ui_range(prop, 0, 64, 1, 0);
RNA_def_property_range(prop, 0, SHRT_MAX);
- RNA_def_property_ui_text(prop, "Render Resolution V", "Surface resolution in V direction used while rendering. Zero skips this property");
+ RNA_def_property_ui_text(prop, "Render Resolution V", "Surface resolution in V direction used while rendering (zero skips this property)");
prop= RNA_def_property(srna, "eval_time", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "ctime");
- RNA_def_property_ui_text(prop, "Evaluation Time", "Parametric position along the length of the curve that Objects 'following' it should be at. Position is evaluated by dividing by the 'Path Length' value");
+ RNA_def_property_ui_text(prop, "Evaluation Time", "Parametric position along the length of the curve that Objects 'following' it should be at (position is evaluated by dividing by the 'Path Length' value)");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
/* pointers */
@@ -1392,7 +1392,7 @@
/* texture space */
prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "texflag", CU_AUTOSPACE);
- RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object");
+ RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjust active object's texture space automatically when transforming object");
RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Curve_texspace_set");
prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c 2011-11-26 16:15:32 UTC (rev 42173)
@@ -123,7 +123,7 @@
prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER);
RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
RNA_def_property_array(prop, 20);
- RNA_def_property_ui_text(prop, "Dupli Layers", "Layers visible when this groups is instanced as a dupli");
+ RNA_def_property_ui_text(prop, "Dupli Layers", "Layers visible when this group is instanced as a dupli");
prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c 2011-11-26 16:15:32 UTC (rev 42173)
@@ -462,7 +462,7 @@
prop= RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_field_order_items);
- RNA_def_property_ui_text(prop, "Field Order", "Order of video fields. Select which lines are displayed first");
+ RNA_def_property_ui_text(prop, "Field Order", "Order of video fields (select which lines are displayed first)");
RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL);
/* booleans */
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c 2011-11-26 15:18:30 UTC (rev 42172)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c 2011-11-26 16:15:32 UTC (rev 42173)
@@ -611,13 +611,13 @@
prop= RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "type", KEY_RELATIVE);
- RNA_def_property_ui_text(prop, "Relative", "Makes shape keys relative");
+ RNA_def_property_ui_text(prop, "Relative", "Make shape keys relative");
RNA_def_property_update(prop, 0, "rna_Key_update_data");
prop= RNA_def_property(srna, "slurph", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "slurph");
RNA_def_property_range(prop, -500, 500);
- RNA_def_property_ui_text(prop, "Slurph", "Creates a delay in amount of frames in applying keypositions, first vertex goes first");
+ RNA_def_property_ui_text(prop, "Slurph", "Create a delay (in frames) in applying keypositions, first vertex goes first");
RNA_def_property_update(prop, 0, "rna_Key_update_data");
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list