From 2e2dc9b9e32d104a0f7c3241ea0c11b57a37fd5b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 16 Aug 2015 17:32:01 +1000 Subject: Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`. --- source/blender/nodes/CMakeLists.txt | 2 +- source/blender/nodes/SConscript | 2 +- source/blender/nodes/composite/node_composite_tree.c | 2 +- source/blender/nodes/composite/node_composite_util.h | 2 +- source/blender/nodes/composite/nodes/node_composite_keying.c | 2 +- source/blender/nodes/intern/node_common.c | 2 +- source/blender/nodes/intern/node_util.c | 2 +- source/blender/nodes/shader/node_shader_tree.c | 2 +- source/blender/nodes/shader/node_shader_util.h | 2 +- source/blender/nodes/texture/node_texture_tree.c | 2 +- source/blender/nodes/texture/node_texture_util.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/nodes') diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 13dede8877a..d20881df150 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -29,9 +29,9 @@ set(INC intern shader texture - ../blenfont ../blenkernel ../blenlib + ../blentranslation ../gpu ../imbuf ../makesdna diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index c41e399ec29..ad500725812 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -41,9 +41,9 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '../blenfont', '../blenkernel', '../blenlib', + '../blentranslation', '../gpu', '../imbuf', '../makesdna', diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 8bc61862458..cb565bd5491 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -36,7 +36,7 @@ #include "DNA_scene_types.h" #include "DNA_node_types.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h index 3f9cfc03089..2dac0cc639a 100644 --- a/source/blender/nodes/composite/node_composite_util.h +++ b/source/blender/nodes/composite/node_composite_util.h @@ -40,7 +40,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_colortools.h" #include "BKE_image.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.c b/source/blender/nodes/composite/nodes/node_composite_keying.c index ba179bcbcd3..6dd2bcc9002 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.c +++ b/source/blender/nodes/composite/nodes/node_composite_keying.c @@ -30,7 +30,7 @@ * \ingroup cmpnodes */ -#include "BLF_translation.h" +#include "BLT_translation.h" #include "DNA_movieclip_types.h" diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index c397af97783..12cd93e418b 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -38,7 +38,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_node.h" diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index cc8249b0f57..046188f8508 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -38,7 +38,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_colortools.h" #include "BKE_node.h" diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index cd2c6f68726..c4ec55c8d06 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -44,7 +44,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_context.h" #include "BKE_linestyle.h" diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 8a79603fab4..2f96bdbe3df 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -69,7 +69,7 @@ #include "NOD_shader.h" #include "node_util.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index d716c2565c7..714665c303b 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -40,7 +40,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_context.h" #include "BKE_linestyle.h" diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index 2c5ecfdae0d..0410a9d4b33 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -67,7 +67,7 @@ #include "node_util.h" #include "NOD_texture.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -- cgit v1.2.3