diff options
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 14 | ||||
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/collada/SConscript | 36 |
3 files changed, 47 insertions, 8 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 60188071832..e36a9873574 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -38,6 +38,8 @@ #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLF_translation.h" + #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_fcurve.h" @@ -217,7 +219,8 @@ 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, "Group", '.', offsetof(bActionGroup, name), 64); + BLI_uniquename(&act->groups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', + offsetof(bActionGroup, name), 64); } /* add F-Curve to group */ @@ -1968,14 +1971,15 @@ void AnimationImporter::add_bone_fcurve(Object *ob, COLLADAFW::Node *node, FCurv if (grp == NULL) { /* Add a new group, and make it active */ grp = (bActionGroup *)MEM_callocN(sizeof(bActionGroup), "bActionGroup"); - + grp->flag = AGRP_SELECTED; BLI_strncpy(grp->name, bone_name, sizeof(grp->name)); - + BLI_addtail(&act->groups, grp); - BLI_uniquename(&act->groups, grp, "Group", '.', offsetof(bActionGroup, name), 64); + BLI_uniquename(&act->groups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', + offsetof(bActionGroup, name), 64); } - + /* add F-Curve to group */ action_groups_add_channel(act, grp, fcu); } diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 8747d2995f2..8b021f75f28 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC . ../blenkernel ../blenlib + ../blenfont ../blenloader ../editors/include ../makesdna @@ -107,6 +108,10 @@ if(WITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO) endif() +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + if(CMAKE_COMPILER_IS_GNUCXX) # COLLADAFWArray.h gives error with gcc 4.5 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 4da99a21517..e1ab774ffbe 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -32,12 +32,42 @@ defs = [] # TODO sanitize inc path building # relative paths to include dirs, space-separated, string +incs = [ + '../ikplugin', + '#/intern/iksolver/extern', + '../blenlib', + '../blenfont', + '../blenkernel', + '../windowmanager', + '../blenloader', + '../makesdna', + '../makesrna', + '../editors/include', + '../imbuf', + '../bmesh', + '#/intern/guardedalloc', +] if env['OURPLATFORM']=='darwin': - incs = '../ikplugin ../../../intern/iksolver/extern ../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../imbuf ../bmesh ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + incs += [ + env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter', + env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils', + env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework', + env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader', + env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser', + ] else: - incs = '../ikplugin ../../../intern/iksolver/extern ../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../imbuf ../bmesh ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + incs += [ + env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter/include', + env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils/include', + env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework/include', + env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader/include', + env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser/include', + ] if env['BF_BUILDINFO']: defs.append('WITH_BUILDINFO') -env.BlenderLib ('bf_collada', sources, Split(incs), defs, libtype='core', priority=200 ) +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + +env.BlenderLib ('bf_collada', sources, incs, defs, libtype='core', priority=200 ) |