From 725543241a95639eb4d445a055664e8ecd8f74b4 Mon Sep 17 00:00:00 2001
From: Gaia Clary <gaia.clary@machinimatrix.org>
Date: Wed, 26 Jun 2013 09:02:11 +0000
Subject: Avoid blender crash during collada export (when armature has
 animation data)

---
 source/blender/collada/AnimationExporter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender/collada/AnimationExporter.cpp')

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 19a49c4344d..bcbcdd42752 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -924,7 +924,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
 	bPoseChannel *parchan = NULL;
 	bPoseChannel *pchan = NULL;
 
-	if (ob->type == OB_ARMATURE ) {
+	if (ob->type == OB_ARMATURE && bone) {
 		bPose *pose = ob->pose;
 		pchan = BKE_pose_channel_find_name(pose, bone->name);
 		if (!pchan)
-- 
cgit v1.2.3