[Bf-blender-cvs] [87a66864bc2] blender2.8: Add back text color for legacy drawing
Campbell Barton
noreply at git.blender.org
Thu Apr 27 19:03:40 CEST 2017
Commit: 87a66864bc2ed740b5740bb29eefbf9dcf8387cd
Author: Campbell Barton
Date: Fri Apr 28 03:04:51 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB87a66864bc2ed740b5740bb29eefbf9dcf8387cd
Add back text color for legacy drawing
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 7fe4a1d3570..34e446a5a26 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -936,10 +936,12 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write)
glDepthMask(GL_FALSE);
}
+ const int font_id = BLF_default();
+
for (vos = g_v3d_strings[g_v3d_string_level]; vos; vos = vos->next) {
if (vos->sco[0] != IS_CLIPPED) {
if (col_pack_prev != vos->col.pack) {
- //glColor3ubv(vos->col.ub);
+ BLF_color3ubv(font_id, vos->col.ub);
col_pack_prev = vos->col.pack;
}
More information about the Bf-blender-cvs
mailing list