archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix missing conversion of uchar color to float

Browse Source 
Decided to just pass float [4] args, so no type conversion is needed at all.
This commit is contained in:
Julian Eisel
2016-11-22 14:40:57 +01:00
parent 559bd75766
commit 60ce602380
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/UI_interface.h
View File

@@ -1052,7 +1052,7 @@ void UI_fontstyle_draw_rotated(const struct uiFontStyle *fs, const struct rcti *
void UI_fontstyle_draw_simple(const struct uiFontStyle *fs, float x, float y, const char *str);
void UI_fontstyle_draw_simple_backdrop(
const struct uiFontStyle *fs, float x, float y, const char *str,
const unsigned char fg[4], const unsigned char bg[4]);
const float col_fg[4], const float col_bg[4]);
int UI_fontstyle_string_width(const struct uiFontStyle *fs, const char *str);
int UI_fontstyle_height_max(const struct uiFontStyle *fs);

6
source/blender/editors/interface/interface_eyedropper.c
View File

@@ -139,8 +139,8 @@ static void eyedropper_draw_cursor_text(const struct bContext *C, ARegion *ar, c
wmWindow *win = CTX_wm_window(C);
int x = win->eventstate->x;
int y = win->eventstate->y;
const unsigned char fg[4] = {255, 255, 255, 255};
const unsigned char bg[4] = {0, 0, 0, 50};
const float col_fg[4] = {1.0f, 1.0f, 1.0f, 1.0f};
const float col_bg[4] = {0.0f, 0.0f, 0.0f, 0.2f};
if ((name[0] == '\0') ||
@@ -154,7 +154,7 @@ static void eyedropper_draw_cursor_text(const struct bContext *C, ARegion *ar, c
y += U.widget_unit;
UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, fg, bg);
UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, col_fg, col_bg);
}

6
source/blender/editors/interface/interface_style.c
View File

@@ -293,7 +293,7 @@ void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const cha
*/
void UI_fontstyle_draw_simple_backdrop(
const uiFontStyle *fs, float x, float y, const char *str,
const unsigned char fg[4], const unsigned char bg[4])
const float col_fg[4], const float col_bg[4])
{
if (fs->kerning == 1)
BLF_enable(fs->uifont_id, BLF_KERNING_DEFAULT);
@@ -314,9 +314,9 @@ void UI_fontstyle_draw_simple_backdrop(
(y + decent) - margin,
x + width + margin,
(y + decent) + height + margin,
margin, bg);
margin, (float *)col_bg);
glColor4ubv(fg);
glColor4fv(col_fg);
}

6
source/blender/windowmanager/intern/wm_dragdrop.c
View File

@@ -268,10 +268,10 @@ void wm_drags_check_ops(bContext *C, wmEvent *event)
static void wm_drop_operator_draw(const char *name, int x, int y)
{
const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
const unsigned char fg[4] = {255, 255, 255, 255};
const unsigned char bg[4] = {0, 0, 0, 50};
const float col_fg[4] = {1.0f, 1.0f, 1.0f, 1.0f};
const float col_bg[4] = {0.0f, 0.0f, 0.0f, 0.2f};
UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, fg, bg);
UI_fontstyle_draw_simple_backdrop(fstyle, x, y, name, col_fg, col_bg);
}
static const char *wm_drag_name(wmDrag *drag)