[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48102] branches/soc-2012-bratwurst/source /blender/assimp: # bf_assimp: was accidentially re-calculating fcurve handles once per keyframe.

[Alexander Gessler]

Revision: 48102
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48102
Author:   aramis_acg
Date:     2012-06-20 00:24:22 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
# bf_assimp: was accidentially re-calculating fcurve handles once per keyframe. This made animation import a lot slower.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/assimp/AnimationImporter.cpp
    branches/soc-2012-bratwurst/source/blender/assimp/bassimp.cpp

Modified: branches/soc-2012-bratwurst/source/blender/assimp/AnimationImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/AnimationImporter.cpp	2012-06-19 23:24:27 UTC (rev 48101)
+++ branches/soc-2012-bratwurst/source/blender/assimp/AnimationImporter.cpp	2012-06-20 00:24:22 UTC (rev 48102)
@@ -161,6 +161,8 @@
 			continue;
 		}
 
+		calchandles_fcurve(newcu[i]);
+
 		// only add adt if needed - in many cases all fcurves will be NULL
 		// since assimp always writes node anim channels, even if no
 		// animation exists (i.e. it writes constant values taken from
@@ -203,6 +205,7 @@
 			continue;
 		}
 
+		calchandles_fcurve(newcu[i]);
 		add_bone_fcurve(anim.mNodeName.C_Str(), newcu[i]);
 	}
 }
@@ -562,7 +565,6 @@
 	bez.f1 = bez.f2 = bez.f3 = SELECT;
 	bez.h1 = bez.h2 = HD_AUTO;
 	insert_bezt_fcurve(fcu, &bez, 0);
-	calchandles_fcurve(fcu);
 }
 
 

Modified: branches/soc-2012-bratwurst/source/blender/assimp/bassimp.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/bassimp.cpp	2012-06-19 23:24:27 UTC (rev 48101)
+++ branches/soc-2012-bratwurst/source/blender/assimp/bassimp.cpp	2012-06-20 00:24:22 UTC (rev 48102)
@@ -48,7 +48,7 @@
 
 		// XXX: this is a very inconvenient solution (and its not re-entrant either).
 		// the problem is that we should return static strings to Blender, but 
-		// we can't get take them directly from assimp.
+		// we can't take them directly from assimp.
 
 		Assimp::Importer importer;