diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-11 23:46:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-11 23:46:42 +0300 |
| commit | 96d9801423be600268afc57c078063cd9906f609 (patch) | |
| tree | ae7403e6abaf92a735f00b7881f255b732458e22 /source/blender/editors/space_image/image_ops.c | |
| parent | b4446b505ff719689771da58c76bcf65e997db5a (diff) | |
Masking: Numpad-. now centers view to selected control points
Currently feather points are being ignored, it could be improved in the future.
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ca2f19cde91..8c840c0f6b5 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -85,6 +85,7 @@ #include "RNA_enum_types.h" #include "ED_image.h" +#include "ED_mask.h" #include "ED_paint.h" #include "ED_render.h" #include "ED_screen.h" @@ -754,8 +755,15 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) height = height * aspy; /* get bounds */ - if (!ED_uvedit_minmax(scene, ima, obedit, min, max)) - return OPERATOR_CANCELLED; + if (ED_space_image_show_uvedit(sima, obedit)) { + if (!ED_uvedit_minmax(scene, ima, obedit, min, max)) + return OPERATOR_CANCELLED; + } + else if (ED_space_image_check_show_maskedit(scene, sima)) { + if (!ED_mask_selected_minmax(C, min, max)) { + return OPERATOR_CANCELLED; + } + } /* adjust offset and zoom */ sima->xof = (int)(((min[0] + max[0]) * 0.5f - 0.5f) * width); @@ -775,7 +783,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) static int image_view_selected_poll(bContext *C) { - return (space_image_main_area_poll(C) && ED_operator_uvedit(C)); + return (space_image_main_area_poll(C) && (ED_operator_uvedit(C) || ED_operator_mask(C))); } void IMAGE_OT_view_selected(wmOperatorType *ot) |