diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-09 18:33:19 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-09 18:34:28 +0300 |
commit | 491839b3c8b1eb3a98ddce1ddf76e75176124557 (patch) | |
tree | bd96660fbc9e003b313c1d2f4f775f049c553479 /source/blender/editors/uvedit | |
parent | 781db5f8a6582eb46724c7e568ef72c045ae755d (diff) |
Fix T42857: Inconsistency between cache line visibility and ability to change frame from image space
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index b58944e4003..23a5ac80dfb 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -3877,6 +3877,15 @@ static int uv_set_2d_cursor_invoke(bContext *C, wmOperator *op, const wmEvent *e ARegion *ar = CTX_wm_region(C); float location[2]; + if (ar->regiontype == RGN_TYPE_WINDOW) { + if (event->mval[1] <= 16) { + SpaceImage *sima = CTX_wm_space_image(C); + if (sima && ED_space_image_show_cache(sima)) { + return OPERATOR_PASS_THROUGH; + } + } + } + UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &location[0], &location[1]); RNA_float_set_array(op->ptr, "location", location); |