1 files changed, 21 insertions, 22 deletions

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index b79ed1c83c4..05ba82b8bde 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -556,39 +556,38 @@ static void image_zoom_apply(ViewZoomData *vpd,
                              const bool zoom_to_pos)
 {
   float factor;
+  float delta;
 
-  if (viewzoom == USER_ZOOM_CONT) {
-    double time = PIL_check_seconds_timer();
-    float time_step = (float)(time - vpd->timer_lastdraw);
-    float fac;
-    float zfac;
-
+  if (viewzoom != USER_ZOOM_SCALE) {
     if (U.uiflag & USER_ZOOM_HORIZ) {
-      fac = (float)(x - vpd->origx);
+      delta = (float)(x - vpd->origx);
     }
     else {
-      fac = (float)(y - vpd->origy);
+      delta = (float)(y - vpd->origy);
     }
+  }
+  else {
+    delta = x - vpd->origx + y - vpd->origy;
+  }
 
-    if (zoom_invert) {
-      fac = -fac;
-    }
+  delta /= U.pixelsize;
+
+  if (zoom_invert) {
+    delta = -delta;
+  }
+
+  if (viewzoom == USER_ZOOM_CONT) {
+    double time = PIL_check_seconds_timer();
+    float time_step = (float)(time - vpd->timer_lastdraw);
+    float zfac;
 
     /* oldstyle zoom */
-    zfac = 1.0f + ((fac / 20.0f) * time_step);
+    zfac = 1.0f + ((delta / 20.0f) * time_step);
     vpd->timer_lastdraw = time;
     /* this is the final zoom, but instead make it into a factor */
-    // zoom = vpd->sima->zoom * zfac;
     factor = (vpd->sima->zoom * zfac) / vpd->zoom;
   }
   else {
-    /* for now do the same things for scale and dolly */
-    float delta = x - vpd->origx + y - vpd->origy;
-
-    if (zoom_invert) {
-      delta *= -1.0f;
-    }
-
     factor = 1.0f + delta / 300.0f;
   }
 
@@ -3220,10 +3219,10 @@ static void image_sample_apply(bContext *C, wmOperator *op, const wmEvent *event
         int point = RNA_enum_get(op->ptr, "point");
 
         if (point == 1) {
-          curvemapping_set_black_white(curve_mapping, NULL, info->linearcol);
+          BKE_curvemapping_set_black_white(curve_mapping, NULL, info->linearcol);
         }
         else if (point == 0) {
-          curvemapping_set_black_white(curve_mapping, info->linearcol, NULL);
+          BKE_curvemapping_set_black_white(curve_mapping, info->linearcol, NULL);
         }
         WM_event_add_notifier(C, NC_WINDOW, NULL);
       }