[Bf-blender-cvs] [f45470472fb] master: Cleanup: Compile warnings
Aaron Carlisle
noreply at git.blender.org
Thu Oct 21 23:00:44 CEST 2021
Commit: f45470472fb16b7153795735e7c16ad400a71a07
Author: Aaron Carlisle
Date: Thu Oct 21 16:28:42 2021 -0400
Branches: master
https://developer.blender.org/rBf45470472fb16b7153795735e7c16ad400a71a07
Cleanup: Compile warnings
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 1b6fb696a64..52ab13e5cd0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -10648,7 +10648,7 @@ static int ui_handle_menu_event(bContext *C,
menu->menuretval = UI_RETURN_OUT;
}
}
- else if (saferct && !BLI_rctf_isect_pt_v(&saferct->parent, event->xy)) {
+ else if (saferct && !BLI_rctf_isect_pt(&saferct->parent, (float)event->xy[0], (float)event->xy[1])) {
if (block->flag & UI_BLOCK_OUT_1) {
menu->menuretval = UI_RETURN_OK;
}
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 98ae1eb62dc..8d8905ea737 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2979,7 +2979,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
}
}
else {
- sub_v2_v2v2(delta, rc->initial_mouse, event->xy);
+ sub_v2_v2v2_int(delta, rc->initial_mouse, event->xy);
if (rc->zoom_prop) {
RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
delta[0] /= zoom[0];
More information about the Bf-blender-cvs
mailing list