[Bf-blender-cvs] [46c81d7] temp-blf-wordwrap: minor BLF api naming

[Campbell Barton]

Commit: 46c81d742aafc5c787ef714575d471aa827571b3
Author: Campbell Barton
Date:   Sat Aug 29 22:18:33 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rB46c81d742aafc5c787ef714575d471aa827571b3

minor BLF api naming

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

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

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

diff --git a/source/blender/blenfont/BLF_api.h 
b/source/blender/blenfont/BLF_api.h
index bf486cc..474764a 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -139,7 +139,7 @@ void BLF_disable_default(int option);
 void BLF_rotation(int fontid, float angle);
 void BLF_clipping(int fontid, float xmin, float ymin, float xmax, float ymax);
 void BLF_clipping_default(float xmin, float ymin, float xmax, float ymax);
-void BLF_wordwrap_width(int fontid, int wrap_width);
+void BLF_wordwrap(int fontid, int wrap_width);
 void BLF_blur(int fontid, int size);
 
 void BLF_enable(int fontid, int option);
diff --git a/source/blender/blenfont/intern/blf.c 
b/source/blender/blenfont/intern/blf.c
index 41d0a10..cb25dca 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -807,7 +807,7 @@ void BLF_clipping_default(float xmin, float ymin, float 
xmax, float ymax)
        }
 }
 
-void BLF_wordwrap_width(int fontid, int wrap_width)
+void BLF_wordwrap(int fontid, int wrap_width)
 {
        FontBLF *font = blf_get(global_font_default);
 
diff --git a/source/blender/editors/interface/interface_regions.c 
b/source/blender/editors/interface/interface_regions.c
index 5b0365d..9489dc6 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -259,8 +259,8 @@ static void ui_tooltip_region_draw_cb(const bContext 
*UNUSED(C), ARegion *ar)
        rgb_tint(alert_color,  0.0f, 0.8f, tone_bg, 0.1f);  /* red        */
 
        /* draw text */
-       BLF_wordwrap_width(data->fstyle.uifont_id, data->wrap_width);
-       BLF_wordwrap_width(blf_mono_font, data->wrap_width);
+       BLF_wordwrap(data->fstyle.uifont_id, data->wrap_width);
+       BLF_wordwrap(blf_mono_font, data->wrap_width);
 
        bbox.xmin += 0.5f * pad_px;  /* add padding to the text */
        bbox.ymax -= 0.25f * pad_px;
@@ -596,8 +596,8 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, 
uiBut *but)
        }
        BLF_enable(data->fstyle.uifont_id, font_flag);
        BLF_enable(blf_mono_font, font_flag);
-       BLF_wordwrap_width(data->fstyle.uifont_id, data->wrap_width);
-       BLF_wordwrap_width(blf_mono_font, data->wrap_width);
+       BLF_wordwrap(data->fstyle.uifont_id, data->wrap_width);
+       BLF_wordwrap(blf_mono_font, data->wrap_width);
 
        /* these defines tweaked depending on font */
 #define TIP_BORDER_X (16.0f / aspect)

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