diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 12 | ||||
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_random.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_warp.c | 4 |
6 files changed, 18 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cd2ec3e1eae..4bbd3cc8f5f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -208,8 +208,10 @@ class VIEW3D_MT_transform_base(Menu): layout.operator("transform.shear", text="Shear") layout.operator("transform.bend", text="Bend") layout.operator("transform.push_pull", text="Push/Pull") - layout.operator("object.vertex_warp", text="Warp") - layout.operator("object.vertex_random", text="Randomize") + + if context.mode != 'OBJECT': + layout.operator("transform.vertex_warp", text="Warp") + layout.operator("transform.vertex_random", text="Randomize") # Generic transform menu - geometry types diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c98bddc49e1..362b7b01120 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -315,7 +315,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel): row.operator("transform.vert_slide", text="Vertex") col.operator("mesh.noise") col.operator("mesh.vertices_smooth") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") col = layout.column(align=True) col.label(text="Add:") @@ -523,7 +523,7 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel): col.operator("curve.extrude_move", text="Extrude") col.operator("curve.subdivide") col.operator("curve.smooth") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel): @@ -578,7 +578,7 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_surface_edit(View3DPanel, Panel): @@ -655,7 +655,7 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_armatureedit_options(View3DPanel, Panel): @@ -688,7 +688,7 @@ class VIEW3D_PT_tools_mballedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_mball_edit(View3DPanel, Panel): @@ -726,7 +726,7 @@ class VIEW3D_PT_tools_latticeedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") # ********** default tools for pose-mode **************** diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 2801d2711e7..27549ea73f1 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -245,7 +245,7 @@ void OBJECT_OT_vertex_weight_normalize_active_vertex(struct wmOperatorType *ot); void OBJECT_OT_vertex_weight_copy(struct wmOperatorType *ot); /* object_warp.c */ -void OBJECT_OT_vertex_warp(struct wmOperatorType *ot); +void TRANSFORM_OT_vertex_warp(struct wmOperatorType *ot); /* object_shapekey.c */ void OBJECT_OT_shape_key_add(struct wmOperatorType *ot); @@ -271,7 +271,7 @@ void OBJECT_OT_lod_add(struct wmOperatorType *ot); void OBJECT_OT_lod_remove(struct wmOperatorType *ot); /* object_random.c */ -void OBJECT_OT_vertex_random(struct wmOperatorType *ot); +void TRANSFORM_OT_vertex_random(struct wmOperatorType *ot); /* object_transfer_data.c */ void OBJECT_OT_data_transfer(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 00c6a41423a..b2562b7b587 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -200,7 +200,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_vertex_weight_normalize_active_vertex); WM_operatortype_append(OBJECT_OT_vertex_weight_copy); - WM_operatortype_append(OBJECT_OT_vertex_warp); + WM_operatortype_append(TRANSFORM_OT_vertex_warp); WM_operatortype_append(OBJECT_OT_game_property_new); WM_operatortype_append(OBJECT_OT_game_property_remove); @@ -249,7 +249,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_lod_add); WM_operatortype_append(OBJECT_OT_lod_remove); - WM_operatortype_append(OBJECT_OT_vertex_random); + WM_operatortype_append(TRANSFORM_OT_vertex_random); WM_operatortype_append(OBJECT_OT_data_transfer); WM_operatortype_append(OBJECT_OT_datalayout_transfer); diff --git a/source/blender/editors/object/object_random.c b/source/blender/editors/object/object_random.c index 41b26b98047..a293f7a950e 100644 --- a/source/blender/editors/object/object_random.c +++ b/source/blender/editors/object/object_random.c @@ -124,12 +124,12 @@ static int object_rand_verts_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_vertex_random(struct wmOperatorType *ot) +void TRANSFORM_OT_vertex_random(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Randomize"; ot->description = "Randomize vertices"; - ot->idname = "OBJECT_OT_vertex_random"; + ot->idname = "TRANSFORM_OT_vertex_random"; /* api callbacks */ ot->exec = object_rand_verts_exec; diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c index 7413bb07c4c..9f4da87903d 100644 --- a/source/blender/editors/object/object_warp.c +++ b/source/blender/editors/object/object_warp.c @@ -275,14 +275,14 @@ static int object_warp_verts_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_vertex_warp(struct wmOperatorType *ot) +void TRANSFORM_OT_vertex_warp(struct wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ ot->name = "Warp"; ot->description = "Warp vertices around the cursor"; - ot->idname = "OBJECT_OT_vertex_warp"; + ot->idname = "TRANSFORM_OT_vertex_warp"; /* api callbacks */ ot->exec = object_warp_verts_exec; |