diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 16:12:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 16:12:45 +0400 |
commit | 75a188272ed13d4c7d5a618e18d18c0828e617c1 (patch) | |
tree | 0c91bc1cdca7286fca43e3f4b1fe6f18d70b6e10 /source/blender/editors | |
parent | 4c4973350e4e9ed398081f155c15b1c8d960ce61 (diff) |
move pivot point and cursor out of UV rna into image space since both mask and uvedit use them.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_image/space_image.c | 13 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 31fa1f805f9..7001677b4d8 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -318,6 +318,19 @@ static void image_keymap(struct wmKeyConfig *keyconf) RNA_string_set(kmi->ptr, "data_path", "space_data.image.render_slot"); RNA_int_set(kmi->ptr, "value", i); } + + /* pivot */ + kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); + RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); + RNA_string_set(kmi->ptr, "value", "CENTER"); + + kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); + RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); + RNA_string_set(kmi->ptr, "value", "MEDIAN"); + + kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); + RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); + RNA_string_set(kmi->ptr, "value", "CURSOR"); } /* dropboxes */ diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 67e06b1c33c..4154e363292 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -3788,19 +3788,6 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf) WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_snap", SKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_select_mode", TABKEY, KM_PRESS, KM_CTRL, 0); - /* pivot */ - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.uv_editor.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CENTER"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY, KM_PRESS, KM_CTRL, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.uv_editor.pivot_point"); - RNA_string_set(kmi->ptr, "value", "MEDIAN"); - - kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.uv_editor.pivot_point"); - RNA_string_set(kmi->ptr, "value", "CURSOR"); - ED_keymap_proportional_cycle(keyconf, keymap); ED_keymap_proportional_editmode(keyconf, keymap, FALSE); |