diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-28 19:46:48 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-28 19:46:48 +0300 |
| commit | 1dcae9e309b0656a250c53a807f01c1c69cb8e42 (patch) | |
| tree | 03ea69abc394d383704136b9dc58820af3089605 /source/blender/freestyle | |
| parent | 6c99d342d8ab68a60ceddb3ecdca48516fc8ba4d (diff) | |
Fix T47045: add some missing UI i18n translations to texture buttons and freestyle render messages.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/freestyle/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index c14a5c53734..f6b7efe978c 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -556,6 +556,7 @@ set(INC . ../blenkernel ../blenlib + ../blentranslation ../imbuf ../makesdna ../makesrna @@ -574,6 +575,10 @@ set(INC_SYS add_definitions(-DWITH_FREESTYLE) +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + if(WIN32) list(APPEND INC_SYS ${PTHREADS_INC} diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index cae04f8642c..ac1cbefa48c 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -9,6 +9,7 @@ incs = [ '#/extern/glew/include', '../blenkernel', '../blenlib', + '../blentranslation', '../freestyle', '../imbuf', '../makesdna', @@ -27,6 +28,9 @@ defs = ['WITH_FREESTYLE'] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + ######################################################## # folders sources ######################################################## diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index c18c5dad376..85c654ea323 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -54,6 +54,8 @@ extern "C" { #include "BKE_text.h" #include "BKE_context.h" +#include "BLT_translation.h" + #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_callbacks.h" @@ -284,7 +286,7 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions, static void prepare(Render *re, SceneRenderLayer *srl) { // load mesh - re->i.infostr = "Freestyle: Mesh loading"; + re->i.infostr = TIP_("Freestyle: Mesh loading"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; if (controller->LoadMesh(re, srl)) // returns if scene cannot be loaded or if empty @@ -467,7 +469,7 @@ static void prepare(Render *re, SceneRenderLayer *srl) return; // compute view map - re->i.infostr = "Freestyle: View map creation"; + re->i.infostr = TIP_("Freestyle: View map creation"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; controller->ComputeViewMap(); @@ -622,7 +624,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render) // render and composite Freestyle result if (controller->_ViewMap) { // render strokes - re->i.infostr = "Freestyle: Stroke rendering"; + re->i.infostr = TIP_("Freestyle: Stroke rendering"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; g_freestyle.scene = re->scene; |