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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-09-19 19:10:38 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-09-19 19:10:38 +0400
commit706a2c80f01b21b71a62b18d0188c5f371fa0454 (patch)
tree388bdf9e9e112cac7f1dd8b83fb9a0060a824259 /source/gameengine
parentfed299469722ccd7d2b29daabb03ba4a347e7a1e (diff)
i18n: code cleanup and fixing unneeded translation (when partial translation is used only)
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp13
-rw-r--r--[-rwxr-xr-x]source/gameengine/Ketsji/BL_Action.cpp2
-rw-r--r--[-rwxr-xr-x]source/gameengine/Ketsji/BL_Action.h2
-rw-r--r--[-rwxr-xr-x]source/gameengine/Ketsji/BL_ActionManager.cpp2
-rw-r--r--[-rwxr-xr-x]source/gameengine/Ketsji/BL_ActionManager.h2
5 files changed, 10 insertions, 11 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 4e9c8eb8f80..6312fea7698 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -104,7 +104,6 @@ extern char datatoc_bfont_ttf[];
#include "BKE_utildefines.h"
#include "RNA_define.h"
-#include "RNA_access.h"
#ifdef WIN32
#include <windows.h>
@@ -405,12 +404,6 @@ int main(int argc, char** argv)
// We don't use threads directly in the BGE, but we need to call this so things like
// freeing up GPU_Textures works correctly.
BLI_threadapi_init();
- // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c)
- BLF_init(11, U.dpi);
- BLF_lang_init();
- // use default settings
- BLF_lang_encoding("");
- BLF_lang_set("");
RNA_init();
@@ -424,6 +417,12 @@ int main(int argc, char** argv)
IMB_init();
+ // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c)
+ BLF_init(11, U.dpi);
+ BLF_lang_init();
+ BLF_lang_encoding("");
+ BLF_lang_set("");
+
BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size);
// Parse command line options
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
index 5bc86264f9c..08794042e37 100755..100644
--- a/source/gameengine/Ketsji/BL_Action.cpp
+++ b/source/gameengine/Ketsji/BL_Action.cpp
@@ -1,5 +1,5 @@
/**
- * $Id: BL_Action.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h
index de2bedb7062..92fbe95fd54 100755..100644
--- a/source/gameengine/Ketsji/BL_Action.h
+++ b/source/gameengine/Ketsji/BL_Action.h
@@ -1,5 +1,5 @@
/**
- * $Id: BL_Action.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/source/gameengine/Ketsji/BL_ActionManager.cpp b/source/gameengine/Ketsji/BL_ActionManager.cpp
index 2b7719a46ff..4e4d3bc539e 100755..100644
--- a/source/gameengine/Ketsji/BL_ActionManager.cpp
+++ b/source/gameengine/Ketsji/BL_ActionManager.cpp
@@ -1,5 +1,5 @@
/**
- * $Id: BL_ActionManager.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/source/gameengine/Ketsji/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h
index 96a37756124..a3c8379981e 100755..100644
--- a/source/gameengine/Ketsji/BL_ActionManager.h
+++ b/source/gameengine/Ketsji/BL_ActionManager.h
@@ -1,5 +1,5 @@
/**
- * $Id: BL_ActionManager.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*