blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

fix D2489: Collada exporter broke edit data when exporting Armature while in Armature edit mode

This commit is contained in:
Gaia Clary 2017-01-28 21:51:18 +01:00
parent e4e1900012
commit c64c901535
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/collada/ArmatureExporter.cpp
View File

@ -69,7 +69,10 @@ void ArmatureExporter::add_armature_bones(Object *ob_arm, Scene *sce,
// write bone nodes
bArmature * armature = (bArmature *)ob_arm->data;
ED_armature_to_edit(armature);
bool is_edited = armature->edbo != NULL;
if (!is_edited)
ED_armature_to_edit(armature);
bArmature *arm = (bArmature *)ob_arm->data;
for (Bone *bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
@ -78,8 +81,10 @@ void ArmatureExporter::add_armature_bones(Object *ob_arm, Scene *sce,
add_bone_node(bone, ob_arm, sce, se, child_objects);
}
ED_armature_from_edit(armature);
ED_armature_edit_free(armature);
if (!is_edited) {
ED_armature_from_edit(armature);
ED_armature_edit_free(armature);
}
}
void ArmatureExporter::write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone)