[Bf-blender-cvs] [4736f19] blender2.8: BLF: early exit when drawing empty strings

[Mike Erwin]

Commit: 4736f1900070449ea1440c3267e943fb1bc4994c
Author: Mike Erwin
Date:   Fri Oct 14 19:59:59 2016 -0400
Branches: blender2.8
https://developer.blender.org/rB4736f1900070449ea1440c3267e943fb1bc4994c

BLF: early exit when drawing empty strings

Avoids all kinds of setup & preparations to draw nothing.

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

M       source/blender/blenfont/intern/blf.c

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

diff --git a/source/blender/blenfont/intern/blf.c 
b/source/blender/blenfont/intern/blf.c
index e43d2bb..7ddc540 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -566,6 +566,10 @@ void BLF_draw_ex(
 }
 void BLF_draw(int fontid, const char *str, size_t len)
 {
+       if (len == 0 || str[0] == '\0') {
+               return;
+       }
+
        BLF_draw_ex(fontid, str, len, NULL);
 }
 
@@ -591,11 +595,19 @@ void BLF_draw_ascii_ex(
 }
 void BLF_draw_ascii(int fontid, const char *str, size_t len)
 {
+       if (len == 0 || str[0] == '\0') {
+               return;
+       }
+
        BLF_draw_ascii_ex(fontid, str, len, NULL);
 }
 
 int BLF_draw_mono(int fontid, const char *str, size_t len, int cwidth)
 {
+       if (len == 0 || str[0] == '\0') {
+               return 0;
+       }
+
        FontBLF *font = blf_get(fontid);
        int columns = 0;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs