From de0c269c2803cfe94859f84673f5eb18eea310c0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 May 2015 17:55:34 +1000 Subject: Fix T44821: Making warp shortcut fails Using OBJECT prefix for editmode operators causes shortcuts to go into the wrong keymap. --- source/blender/editors/object/object_intern.h | 4 ++-- source/blender/editors/object/object_ops.c | 4 ++-- source/blender/editors/object/object_random.c | 4 ++-- source/blender/editors/object/object_warp.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/object') 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; -- cgit v1.2.3