[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48919] branches/soc-2012-bratwurst/source /blender/collada:

[Sukhitha Jayathilake]

Revision: 48919
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48919
Author:   phabtar
Date:     2012-07-14 17:15:20 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h

Modified: branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp	2012-07-14 16:54:10 UTC (rev 48918)
+++ branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp	2012-07-14 17:15:20 UTC (rev 48919)
@@ -835,8 +835,7 @@
 	bPoseChannel *pchan = NULL;
 	bPoseChannel *rootchan = NULL;
 	bPoseChannel *itrpchan;
-	float actframe = BKE_nla_tweakedit_remap(ob->adt, (float)CFRA, 0);
-
+	
 	if (ob->type == OB_ARMATURE ){
 		bPose *pose = ob->pose;
 		pchan = BKE_pose_channel_find_name(pose, bone->name);
@@ -932,6 +931,8 @@
 		source.appendValues(outmat);
 
 		j++;
+
+		BIK_release_tree(scene, ob, ctime);
 	}
 
 	enable_fcurves(ob->adt->action, NULL);

Modified: branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h	2012-07-14 16:54:10 UTC (rev 48918)
+++ branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h	2012-07-14 17:15:20 UTC (rev 48919)
@@ -43,7 +43,7 @@
 #include "BKE_animsys.h"
 #include "BKE_scene.h"
 #include "BKE_object.h"
-#include "BKE_nla.h"
+//#include "BKE_nla.h"
 
 #ifdef NAN_BUILDINFO
 extern char build_rev[];