[Bf-blender-cvs] [592dd9dea6a] master: Modify menu from last commit

[Campbell Barton]

Commit: 592dd9dea6aa6e8f954e7604b497bdd9c2387e21
Author: Campbell Barton
Date:   Mon Aug 21 15:24:40 2017 +1000
Branches: master
https://developer.blender.org/rB592dd9dea6aa6e8f954e7604b497bdd9c2387e21

Modify menu from last commit

Also correct tool-tip.

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/object/object_transform.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 02c0f69ac82..f4e83530383 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -294,7 +294,8 @@ class VIEW3D_MT_transform_object(VIEW3D_MT_transform_base):
         layout.operator("object.origin_set", text="Geometry to Origin").type = 'GEOMETRY_ORIGIN'
         layout.operator("object.origin_set", text="Origin to Geometry").type = 'ORIGIN_GEOMETRY'
         layout.operator("object.origin_set", text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR'
-        layout.operator("object.origin_set", text="Origin to Center of Mass").type = 'ORIGIN_CENTER_OF_MASS'
+        layout.operator("object.origin_set", text="Origin to Center of Mass (Surface)").type = 'ORIGIN_CENTER_OF_MASS'
+        layout.operator("object.origin_set", text="Origin to Center of Mass (Volume)").type = 'ORIGIN_CENTER_OF_VOLUME'
         layout.separator()
 
         layout.operator("object.randomize_transform")
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 04d8a65e043..6491da4c23c 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -1102,7 +1102,7 @@ void OBJECT_OT_origin_set(wmOperatorType *ot)
 		 "Move object origin to position of the 3D cursor"},
 		/* Intentional naming mismatch since some scripts refer to this. */
 		{ORIGIN_TO_CENTER_OF_MASS_SURFACE, "ORIGIN_CENTER_OF_MASS", 0, "Origin to Center of Mass (Surface)",
-		 "Calculate the center of mass calculated from the surface area"},
+		 "Calculate the center of mass from the surface area"},
 		{ORIGIN_TO_CENTER_OF_MASS_VOLUME, "ORIGIN_CENTER_OF_VOLUME", 0, "Origin to Center of Mass (Volume)",
 		 "Calculate the center of mass from the volume (must be manifold geometry with consistent normals)"},
 		{0, NULL, 0, NULL, NULL}