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:
authorGermano Cavalcante <germano.costa@ig.com.br>2021-10-22 00:11:16 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2021-10-22 00:23:46 +0300
commitd9ebe25a0cfe107c21a125bd780478afd33fb342 (patch)
treea438b2dbfdadd2b871dfba301cc6b352dc04c77d /source/blender/windowmanager/intern
parentf45470472fb16b7153795735e7c16ad400a71a07 (diff)
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 *' ´´´
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c5
1 files changed, 3 insertions, 2 deletions
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];