[Bf-blender-cvs] [d9ebe25a0cf] master: Fix errors in be171b295fc7d

[Germano Cavalcante]

Commit: d9ebe25a0cfe107c21a125bd780478afd33fb342
Author: Germano Cavalcante
Date:   Thu Oct 21 18:11:16 2021 -0300
Branches: master
https://developer.blender.org/rBd9ebe25a0cfe107c21a125bd780478afd33fb342

Fix errors in be171b295fc7d

´´´
error C4133: 'function': incompatible types - from 'float [2]' to 'int *'
error C4133: 'function': incompatible types - from 'const int [2]' to 'const float *'
´´´

===================================================================

M	source/blender/editors/util/ed_draw.c
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/editors/util/ed_draw.c b/source/blender/editors/util/ed_draw.c
index 089d1635438..2412939e859 100644
--- a/source/blender/editors/util/ed_draw.c
+++ b/source/blender/editors/util/ed_draw.c
@@ -360,7 +360,7 @@ static void slider_update_factor(tSlider *slider, const wmEvent *event)
   /* Reduced factor delta in precision mode (shift held). */
   slider->raw_factor += slider->precision ? (factor_delta / 8) : factor_delta;
   slider->factor = slider->raw_factor;
-  copy_v2_v2_int(slider->last_cursor, event->xy);
+  copy_v2fl_v2i(slider->last_cursor, event->xy);
 
   if (!slider->overshoot) {
     slider->factor = clamp_f(slider->factor, 0, 1);
@@ -402,7 +402,7 @@ tSlider *ED_slider_create(struct bContext *C)
  */
 void ED_slider_init(struct tSlider *slider, const wmEvent *event)
 {
-  copy_v2_v2_int(slider->last_cursor, event->xy);
+  copy_v2fl_v2i(slider->last_cursor, event->xy);
 }
 
 /**
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 8d8905ea737..89f0206d72e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2956,7 +2956,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
             delta[1] = rc->initial_mouse[1] - rc->slow_mouse[1];
 
             /* precision angle gets calculated from dial and gets added later */
-            angle_precision = -0.1f * BLI_dial_angle(rc->dial, event->xy);
+            angle_precision = -0.1f * BLI_dial_angle(rc->dial, (float[2]){UNPACK2(event->xy)});
           }
           else {
             delta[0] = rc->initial_mouse[0] - rc->slow_mouse[0];
@@ -2979,7 +2979,8 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
           }
         }
         else {
-          sub_v2_v2v2_int(delta, rc->initial_mouse, event->xy);
+          delta[0] = (float)(rc->initial_mouse[0] - event->xy[0]);
+          delta[1] = (float)(rc->initial_mouse[1] - event->xy[1]);
           if (rc->zoom_prop) {
             RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
             delta[0] /= zoom[0];