Merge -c 25001,25310,25311,25638,25746 from COLLADA branch into trunk.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 5 Jan 2010 17:42:01 +0000 (17:42 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 5 Jan 2010 17:42:01 +0000 (17:42 +0000)
1  2 
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp

index d2543423097c8d76493adb3baf2b1ec2f0d1f365,38f96a786e5bea3e7c527f6f1881f62badcce958..ef36a2eea9a1ad7e8427a3fe70f191253c0f1d6a
@@@ -21,7 -21,8 +21,8 @@@ extern "C
  {
  #include "BKE_DerivedMesh.h"
  #include "BKE_fcurve.h"
 -#include "BLI_util.h"
+ #include "BKE_animsys.h"
 +#include "BLI_path_util.h"
  #include "BLI_fileops.h"
  #include "ED_keyframing.h"
  }