diff options
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 478e484924a..f9160774c41 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -728,10 +728,10 @@ void IMAGE_OT_view_zoom(wmOperatorType *ot) WM_operator_properties_use_cursor_init(ot); } -#ifdef WITH_INPUT_NDOF - /** \} */ +#ifdef WITH_INPUT_NDOF + /* -------------------------------------------------------------------- */ /** \name NDOF Operator * \{ */ @@ -1499,7 +1499,6 @@ static void image_open_draw(bContext *UNUSED(C), wmOperator *op) } } -/* called by other space types too */ void IMAGE_OT_open(wmOperatorType *ot) { /* identifiers */ @@ -1574,7 +1573,6 @@ static int image_match_len_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -/* called by other space types too */ void IMAGE_OT_match_movie_length(wmOperatorType *ot) { /* identifiers */ @@ -3190,8 +3188,10 @@ void IMAGE_OT_unpack(wmOperatorType *ot) /** \name Sample Image Operator * \{ */ -/* Returns mouse position in image space. */ -bool ED_space_image_get_position(SpaceImage *sima, struct ARegion *ar, int mval[2], float fpos[2]) +bool ED_space_image_get_position(SpaceImage *sima, + struct ARegion *region, + int mval[2], + float fpos[2]) { void *lock; ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock, 0); @@ -3201,13 +3201,12 @@ bool ED_space_image_get_position(SpaceImage *sima, struct ARegion *ar, int mval[ return false; } - UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &fpos[0], &fpos[1]); + UI_view2d_region_to_view(®ion->v2d, mval[0], mval[1], &fpos[0], &fpos[1]); ED_space_image_release_buffer(sima, ibuf, lock); return true; } -/* Returns color in linear space, matching ED_space_node_color_sample(). */ bool ED_space_image_color_sample( SpaceImage *sima, ARegion *region, int mval[2], float r_col[3], bool *r_is_data) { @@ -4137,3 +4136,5 @@ void IMAGE_OT_tile_fill(wmOperatorType *ot) def_fill_tile(ot->srna); } + +/** \} */ |