diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-04 10:07:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-04 10:07:05 +0300 |
| commit | 935b18ec7563ff9bfc78300972bd0a8673aac8ee (patch) | |
| tree | 70b4cb64cfe6e27b196f6cc89cab950a7b8c84de /source/blender/editors | |
| parent | b7aeadcaa9c839be95023ee29d198abd3447fcc3 (diff) | |
UV: support setting the cursor w/ non-cursor tools
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mask/mask_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index 1d815277ed4..19861a75e4e 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -615,7 +615,7 @@ void ED_keymap_mask(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "MASK_OT_paste_splines", VKEY, KM_PRESS, KM_CTRL, 0); /* for image editor only */ - WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_CLICK, 0, 0); /* Transform (don't use transform_keymap_for_space() since this maps to different spaces) */ WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 1c8b24e866c..07ef7a4db0d 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -288,13 +288,12 @@ static bool image_sample_poll(bContext *C) { SpaceImage *sima = CTX_wm_space_image(C); if (sima) { - Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - ToolSettings *toolsettings = scene->toolsettings; - if (obedit) { - if (ED_space_image_show_uvedit(sima, obedit) && (toolsettings->use_uv_sculpt)) + /* Disable when UV editing so it doesn't swallow all click events (use for setting cursor). */ + if (ED_space_image_show_uvedit(sima, obedit)) { return false; + } } else if (sima->mode != SI_MODE_VIEW) { return false; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 48f2f288aa1..92c38567354 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -4700,6 +4700,9 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf) keymap = WM_keymap_ensure(keyconf, "UV Editor", 0, 0); keymap->poll = ED_operator_uvedit_can_uv_sculpt; + /* cursor */ + WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_CLICK, 0, 0); + #ifdef USE_WM_KEYMAP_27X /* Uv sculpt toggle */ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", QKEY, KM_PRESS, 0, 0); @@ -4785,9 +4788,6 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "UV_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); - /* cursor */ - WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); - /* menus */ WM_keymap_add_menu_pie(keymap, "IMAGE_MT_uvs_snap_pie", SKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_select_mode", TABKEY, KM_PRESS, KM_CTRL, 0); |