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/editors/space_outliner/CMakeLists.txt | 2 +- source/blender/editors/space_outliner/SConscript | 2 +- source/blender/editors/space_outliner/outliner_draw.c | 4 ++-- source/blender/editors/space_outliner/outliner_edit.c | 2 +- source/blender/editors/space_outliner/outliner_tree.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index b716f0671bd..289d6e715e1 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -22,7 +22,7 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenfont + ../../blentranslation ../../imbuf ../../gpu ../../makesdna diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript index ae3e960124f..dce559a21df 100644 --- a/source/blender/editors/space_outliner/SConscript +++ b/source/blender/editors/space_outliner/SConscript @@ -37,9 +37,9 @@ incs = [ env['BF_GLEW_INC'], '#/intern/glew-mx', '../include', - '../../blenfont', '../../blenkernel', '../../blenlib', + '../../blentranslation', '../../gpu', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 420b73cee86..b3761336035 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -43,7 +43,7 @@ #include "BLI_utildefines.h" #include "BLI_mempool.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_context.h" #include "BKE_deform.h" @@ -567,7 +567,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) Object *ob = (Object *)tselem->id; // id = object bActionGroup *grp = te->directdata; - BLI_uniquename(&ob->pose->agroups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', + BLI_uniquename(&ob->pose->agroups, grp, CTX_DATA_(BLT_I18NCONTEXT_ID_ACTION, "Group"), '.', offsetof(bActionGroup, name), sizeof(grp->name)); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); break; diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 0821304abf3..1ddd25f9219 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -41,7 +41,7 @@ #include "BLI_utildefines.h" #include "BLI_mempool.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_animsys.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 7b73a694570..48a15eac337 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -58,7 +58,7 @@ #include "BLI_mempool.h" #include "BLI_fnmatch.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_fcurve.h" #include "BKE_main.h" -- cgit v1.2.3