Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-24 10:24:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-24 10:24:53 +0400
commit5a90ea77bc1333efe4e1e54984a080550ed3f707 (patch)
tree8ba5f94ddcd2c57440197a910305daae5e913554 /source/blender/blenfont/intern
parent69e6894b15271884623ea6f56ead06db83acbe99 (diff)
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/blenfont/intern')
-rw-r--r--source/blender/blenfont/intern/blf_glyph.c3
-rw-r--r--source/blender/blenfont/intern/blf_translation.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index e542e247755..033efbfc1fc 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -239,7 +239,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
err += FT_Bitmap_Convert(font->ft_lib, &slot->bitmap, &tempbitmap, 1); /* Does Blender use Pitch 1 always? It works so far */
err += FT_Bitmap_Copy(font->ft_lib, &tempbitmap, &slot->bitmap);
err += FT_Bitmap_Done(font->ft_lib, &tempbitmap);
- } else {
+ }
+ else {
err = FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL);
}
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
index f3d4242192b..5d74a844425 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -157,7 +157,7 @@ int BLF_translate_tooltips(void)
const char *BLF_translate_do_iface(const char *context, const char *msgid)
{
#ifdef WITH_INTERNATIONAL
- if(BLF_translate_iface()) {
+ if (BLF_translate_iface()) {
if (context)
return BLF_pgettext(context, msgid);
else
@@ -174,7 +174,7 @@ const char *BLF_translate_do_iface(const char *context, const char *msgid)
const char *BLF_translate_do_tooltip(const char *context, const char *msgid)
{
#ifdef WITH_INTERNATIONAL
- if(BLF_translate_tooltips()) {
+ if (BLF_translate_tooltips()) {
if (context)
return BLF_pgettext(context, msgid);
else