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/space_image | |
parent | b7aeadcaa9c839be95023ee29d198abd3447fcc3 (diff) |
UV: support setting the cursor w/ non-cursor tools
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |