archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-09-27 00:24:10 +10:00
parent 51c87bbad0 870dfb1b5a
commit 772944a6b4
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/collada/AnimationExporter.cpp
View File

@@ -313,12 +313,12 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
if (ob->type == OB_ARMATURE) {
ob_name = getObjectBoneName(ob, fcu);
BLI_snprintf(
anim_id,
sizeof(anim_id),
"%s_%s.%s",
(char *)translate_id(ob_name).c_str(),
(char *)translate_id(transformName).c_str(),
axis_name);
anim_id,
sizeof(anim_id),
"%s_%s.%s",
(char *)translate_id(ob_name).c_str(),
(char *)translate_id(transformName).c_str(),
axis_name);
}
else {
if (ma)
@@ -327,12 +327,12 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
ob_name = id_name(ob);
BLI_snprintf(
anim_id,
sizeof(anim_id),
"%s_%s_%s",
(char *)translate_id(ob_name).c_str(),
(char *)getAnimationPathId(fcu).c_str(),
axis_name);
anim_id,
sizeof(anim_id),
"%s_%s_%s",
(char *)translate_id(ob_name).c_str(),
(char *)getAnimationPathId(fcu).c_str(),
axis_name);
}
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);