[Bf-blender-cvs] [cc26deef55] temp-blender2.8-stable: OpenGL immediate mode: fix Waveform Font color

Clément Foucault noreply at git.blender.org
Wed Feb 8 00:53:01 CET 2017


Commit: cc26deef55f5c1ac895f641d2cc03d561649f1a4
Author: Clément Foucault
Date:   Tue Feb 7 22:40:01 2017 +0100
Branches: temp-blender2.8-stable
https://developer.blender.org/rBcc26deef55f5c1ac895f641d2cc03d561649f1a4

OpenGL immediate mode: fix Waveform Font color

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

M	source/blender/blenfont/BLF_api.h
M	source/blender/blenfont/intern/blf.c
M	source/blender/editors/interface/interface_draw.c

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

diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 649ec9c5a4..1b967f889c 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -70,6 +70,7 @@ void BLF_color4ubv(int fontid, const unsigned char rgba[4]);
 void BLF_color3ubv(int fontid, const unsigned char rgb[3]);
 void BLF_color3ubv_alpha(int fontid, const unsigned char rgb[3], unsigned char alpha);
 void BLF_color3ub(int fontid, unsigned char r, unsigned char g, unsigned char b);
+void BLF_color4f(int fontid, float r, float g, float b, float a);
 void BLF_color4fv(int fontid, const float rgba[4]);
 void BLF_color3f(int fontid, float r, float g, float b);
 void BLF_color3fv_alpha(int fontid, const float rgb[3], float alpha);
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 04b6eb0ad3..bc914083c0 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -503,6 +503,12 @@ void BLF_color4fv(int fontid, const float rgba[4])
 	}
 }
 
+void BLF_color4f(int fontid, float r, float g, float b, float a)
+{
+	float rgba[4] = { r, g, b, a };
+	BLF_color4fv(fontid, rgba);
+}
+
 void BLF_color3fv_alpha(int fontid, const float rgb[3], float alpha)
 {
 	float rgba[4];
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 32df2aaebb..1cd1921d12 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -764,8 +764,10 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
 	/* draw scale numbers first before binding any shader */
 	for (int i = 0; i < 6; i++) {
 		char str[4];
+		const int font_id = BLF_default();
 		BLI_snprintf(str, sizeof(str), "%-3d", i * 20);
 		str[3] = '\0';
+		BLF_color4f(font_id, 1.f, 1.f, 1.f, 0.08f);
 		BLF_draw_default(rect.xmin + 1, yofs - 5 + (i / 5.f) * h, 0, str, sizeof(str) - 1);
 	}




More information about the Bf-blender-cvs mailing list