Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarshit Mehta <harshitmehta2293@gmail.com>2014-04-01 19:33:43 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-04-01 20:00:14 +0400
commitad7980a51a7e1c2492691e403ffdf84a29081c35 (patch)
tree8dd690b39cf93e81d7e0d910e93dd78c56d1c7e6 /source/blender/editors/space_image/image_ops.c
parent420da872a65596920bbf04b15a1bb246c9a523f3 (diff)
Image and clip editor: change zoom step to end up at powers of two.
When you press zoom 3 times you will now get 2:1, 4:1, 8:1, etc. Fixes T36916. Reviewed By: brecht Differential Revision: https://developer.blender.org/D409
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
-rw-r--r--source/blender/editors/space_image/image_ops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 93cb1acaa8b..109525f80cf 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -776,10 +776,10 @@ static int image_view_zoom_in_exec(bContext *C, wmOperator *op)
SpaceImage *sima = CTX_wm_space_image(C);
ARegion *ar = CTX_wm_region(C);
float location[2];
-
+
RNA_float_get_array(op->ptr, "location", location);
- sima_zoom_set_factor(sima, ar, 1.25f, location);
+ sima_zoom_set_factor(sima, ar, powf(2.0f, 1.0f/3.0f), location);
ED_region_tag_redraw(CTX_wm_region(C));
@@ -821,11 +821,11 @@ static int image_view_zoom_out_exec(bContext *C, wmOperator *op)
SpaceImage *sima = CTX_wm_space_image(C);
ARegion *ar = CTX_wm_region(C);
float location[2];
-
+
RNA_float_get_array(op->ptr, "location", location);
- sima_zoom_set_factor(sima, ar, 0.8f, location);
-
+ sima_zoom_set_factor(sima, ar, powf(0.5f, 1.0f/3.0f), location);
+
ED_region_tag_redraw(CTX_wm_region(C));
return OPERATOR_FINISHED;