diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-16 10:32:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-18 00:01:26 +0300 |
| commit | 2e2dc9b9e32d104a0f7c3241ea0c11b57a37fd5b (patch) | |
| tree | a6830032130d13dcbfa522ed6889fe6f141f99f3 /source/blender/collada | |
| parent | 3047b96eaa962fe45d2333f5ea4be809e02787cd (diff) | |
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`.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 6 | ||||
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/collada/SConscript | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 7e937e42787..e5f7bb2eb89 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -38,7 +38,7 @@ #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -219,7 +219,7 @@ void AnimationImporter::add_fcurves_to_object(Object *ob, std::vector<FCurve *>& BLI_strncpy(grp->name, bone_name, sizeof(grp->name)); BLI_addtail(&act->groups, grp); - BLI_uniquename(&act->groups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', + BLI_uniquename(&act->groups, grp, CTX_DATA_(BLT_I18NCONTEXT_ID_ACTION, "Group"), '.', offsetof(bActionGroup, name), 64); } @@ -1994,7 +1994,7 @@ void AnimationImporter::add_bone_fcurve(Object *ob, COLLADAFW::Node *node, FCurv BLI_strncpy(grp->name, bone_name, sizeof(grp->name)); BLI_addtail(&act->groups, grp); - BLI_uniquename(&act->groups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', + BLI_uniquename(&act->groups, grp, CTX_DATA_(BLT_I18NCONTEXT_ID_ACTION, "Group"), '.', offsetof(bActionGroup, name), 64); } diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 24daa41201d..293049a1a05 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -29,7 +29,7 @@ set(INC . ../blenkernel ../blenlib - ../blenfont + ../blentranslation ../editors/include ../makesdna ../makesrna diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 1bd3947ff49..7853769a0f8 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -36,8 +36,8 @@ incs = [ '../ikplugin', '#/intern/iksolver/extern', '../blenlib', - '../blenfont', '../blenkernel', + '../blentranslation', '../windowmanager', '../makesdna', '../makesrna', |