Revision: 25030
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25030
Author: billrey
Date: 2009-11-30 15:40:45 +0100 (Mon, 30 Nov 2009)
Log Message:
-----------
Rename Centroid to Origin, following discussions on mailing list.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_group.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-11-30 14:10:46 UTC
(rev 25029)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-11-30 14:40:45 UTC
(rev 25030)
@@ -88,7 +88,7 @@
sub1.prop(view, "show_playback_fps", text="Playback FPS")
sub1.prop(view, "global_scene")
sub1.prop(view, "pin_floating_panels")
- sub1.prop(view, "object_center_size")
+ sub1.prop(view, "object_origin_size")
sub1.separator()
sub1.separator()
sub1.separator()
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2009-11-30 14:10:46 UTC
(rev 25029)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2009-11-30 14:40:45 UTC
(rev 25030)
@@ -146,9 +146,9 @@
layout.operator_context = 'EXEC_AREA'
- layout.operator("object.center_set", text="ObData to Centroid").type =
'CENTER'
- layout.operator("object.center_set", text="Centroid to ObData").type =
'CENTER_NEW'
- layout.operator("object.center_set", text="Centroid to 3D
Cursor").type = 'CENTER_CURSOR'
+ layout.operator("object.center_set", text="Object Data to
Origin").type = 'CENTER'
+ layout.operator("object.center_set", text="Origin to Object
Data").type = 'CENTER_NEW'
+ layout.operator("object.center_set", text="Origin to 3D Cursor").type
= 'CENTER_CURSOR'
class VIEW3D_MT_mirror(bpy.types.Menu):
@@ -195,7 +195,7 @@
layout.operator("view3d.snap_selected_to_grid", text="Selection to
Grid")
layout.operator("view3d.snap_selected_to_cursor", text="Selection to
Cursor")
- layout.operator("view3d.snap_selected_to_center", text="Selection to
Center")
+ layout.operator("view3d.snap_selected_to_center", text="Selection to
Origin")
layout.separator()
@@ -1621,7 +1621,7 @@
col.prop(view, "display_y_axis", text="Y Axis")
col.prop(view, "display_z_axis", text="Z Axis")
col.prop(view, "outline_selected")
- col.prop(view, "all_object_centers")
+ col.prop(view, "all_object_origins")
col.prop(view, "relationship_lines")
if ob and ob.type == 'MESH':
mesh = ob.data
Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2009-11-30 14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2009-11-30 14:40:45 UTC (rev 25030)
@@ -813,7 +813,7 @@
prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_range(prop, 0.0, 100.f);
- RNA_def_property_ui_text(prop, "Offset", "Offset of floor from object
center.");
+ RNA_def_property_ui_text(prop, "Offset", "Offset of floor from object
origin.");
RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT,
"rna_Constraint_update");
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2009-11-30
14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2009-11-30
14:40:45 UTC (rev 25030)
@@ -547,13 +547,13 @@
prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "xof");
RNA_def_property_range(prop, -50.0f, 50.0f);
- RNA_def_property_ui_text(prop, "X Offset", "Horizontal offset from the
object center");
+ RNA_def_property_ui_text(prop, "X Offset", "Horizontal offset from the
object origin");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "yof");
RNA_def_property_range(prop, -50.0f, 50.0f);
- RNA_def_property_ui_text(prop, "Y Offset", "Vertical offset from the
object center");
+ RNA_def_property_ui_text(prop, "Y Offset", "Vertical offset from the
object origin");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop= RNA_def_property(srna, "ul_position", PROP_FLOAT, PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_group.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_group.c 2009-11-30
14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_group.c 2009-11-30
14:40:45 UTC (rev 25030)
@@ -114,7 +114,7 @@
prop= RNA_def_property(srna, "dupli_offset", PROP_FLOAT,
PROP_TRANSLATION);
RNA_def_property_float_sdna(prop, NULL, "dupli_ofs");
- RNA_def_property_ui_text(prop, "Dupli Offset", "Offset from the center
to use when instancing as DupliGroup.");
+ RNA_def_property_ui_text(prop, "Dupli Offset", "Offset from the origin
to use when instancing as DupliGroup.");
RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, 4);
prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_LAYER);
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-30
14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-30
14:40:45 UTC (rev 25030)
@@ -1868,7 +1868,7 @@
prop= RNA_def_property(srna, "draw_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_AXIS);
- RNA_def_property_ui_text(prop, "Draw Axis", "Displays the object's
center and axis");
+ RNA_def_property_ui_text(prop, "Draw Axis", "Displays the object's
origin and axis");
RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
prop= RNA_def_property(srna, "draw_texture_space", PROP_BOOLEAN,
PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2009-11-30
14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2009-11-30
14:40:45 UTC (rev 25030)
@@ -632,12 +632,12 @@
prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "xof");
- RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally
from the view center");
+ RNA_def_property_ui_text(prop, "X Offset", "Offsets image horizontally
from the world origin");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "yof");
- RNA_def_property_ui_text(prop, "Y Offset", "Offsets image vertically
from the view center");
+ RNA_def_property_ui_text(prop, "Y Offset", "Offsets image vertically
from the world origin");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
@@ -669,7 +669,7 @@
static EnumPropertyItem pivot_items[] = {
{V3D_CENTER, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box
Center", ""},
{V3D_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", ""},
- {V3D_LOCAL, "INDIVIDUAL_CENTERS", ICON_ROTATECOLLECTION,
"Individual Centers", ""},
+ {V3D_LOCAL, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION,
"Individual Origins", ""},
{V3D_CENTROID, "MEDIAN_POINT", ICON_ROTATECENTER, "Median
Point", ""},
{V3D_ACTIVE, "ACTIVE_ELEMENT", ICON_ROTACTIVE, "Active
Element", ""},
{0, NULL, 0, NULL, NULL}};
@@ -770,9 +770,9 @@
RNA_def_property_ui_text(prop, "Outline Selected", "Show an outline
highlight around selected objects in non-wireframe views.");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
- prop= RNA_def_property(srna, "all_object_centers", PROP_BOOLEAN,
PROP_NONE);
+ prop= RNA_def_property(srna, "all_object_origins", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DRAW_CENTERS);
- RNA_def_property_ui_text(prop, "All Object Centers", "Show the object
center dot for all (selected and unselected) objects.");
+ RNA_def_property_ui_text(prop, "All Object Origins", "Show the object
origin center dot for all (selected and unselected) objects.");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
prop= RNA_def_property(srna, "relationship_lines", PROP_BOOLEAN,
PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2009-11-30
14:10:46 UTC (rev 25029)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2009-11-30
14:40:45 UTC (rev 25030)
@@ -1729,7 +1729,7 @@
prop= RNA_def_property(srna, "rotate_around_selection", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag",
USER_ORBIT_SELECTION);
- RNA_def_property_ui_text(prop, "Rotate Around Selection", "Use
selection as the orbiting center.");
+ RNA_def_property_ui_text(prop, "Rotate Around Selection", "Use
selection as the pivot point.");
/* select with */
@@ -1804,10 +1804,10 @@
RNA_def_property_range(prop, 4, 40);
RNA_def_property_ui_text(prop, "Manipulator Hotspot", "Hotspot in
pixels for clicking widget handles.");
- prop= RNA_def_property(srna, "object_center_size", PROP_INT, PROP_NONE);
+ prop= RNA_def_property(srna, "object_origin_size", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "obcenter_dia");
RNA_def_property_range(prop, 4, 10);
- RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in
Pixels for Object/Lamp center display.");
+ RNA_def_property_ui_text(prop, "Object Origin Size", "Diameter in
Pixels for Object/Lamp origin display.");
RNA_def_property_update(prop, 0, "rna_userdef_update");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
