diff options
-rw-r--r-- | source/blender/blenlib/intern/math_vector.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index 54615a5264d..098272c9bc0 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -119,7 +119,7 @@ void interp_v3_v3v3_uchar(char unsigned target[3], const unsigned char a[3], con } void interp_v3_v3v3_char(char target[3], const char a[3], const char b[3], const float t) { - interp_v3_v3v3_char((char *)target, (const char *)a, (const char *)b, t); + interp_v3_v3v3_uchar((unsigned char *)target, (const unsigned char *)a, (const unsigned char *)b, t); } void interp_v4_v4v4_uchar(char unsigned target[4], const unsigned char a[4], const unsigned char b[4], const float t) @@ -133,7 +133,7 @@ void interp_v4_v4v4_uchar(char unsigned target[4], const unsigned char a[4], con } void interp_v4_v4v4_char(char target[4], const char a[4], const char b[4], const float t) { - interp_v4_v4v4_char((char *)target, (const char *)a, (const char *)b, t); + interp_v4_v4v4_uchar((unsigned char *)target, (const unsigned char *)a, (const unsigned char *)b, t); } void mid_v3_v3v3(float v[3], const float v1[3], const float v2[3]) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 85afc057142..cfdc0c87fed 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -308,7 +308,7 @@ typedef struct uiAfterFunc { static bool ui_is_but_interactive(const uiBut *but, const bool labeledit); static bool ui_but_contains_pt(uiBut *but, float mx, float my); static bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y); -static uiBut *ui_but_find_mouse_over_ex(ARegion *ar, int x, int y, bool ctrl); +static uiBut *ui_but_find_mouse_over_ex(ARegion *ar, const int x, const int y, const bool labeledit); static uiBut *ui_but_find_mouse_over(ARegion *ar, const wmEvent *event); static void button_activate_init(bContext *C, ARegion *ar, uiBut *but, uiButtonActivateType type); static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state); |