diff options
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 13 | ||||
| -rw-r--r-- | source/blender/collada/AnimationExporter.h | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 2072b1df7a8..81dae097315 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -24,6 +24,7 @@ #include "GeometryExporter.h" #include "AnimationExporter.h" +#include "MaterialExporter.h" template<class Functor> void forEachObjectInScene(Scene *sce, Functor &f) @@ -944,7 +945,17 @@ void AnimationExporter::exportAnimations(Scene *sce) fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first); else if( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action ) fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first); - //The Scene has animations if object type is armature or object has f-curve or object is a Lamp which has f-curves + + for(int a = 0; a < ob->totcol; a++) + { + Material *ma = give_current_material(ob, a+1); + if (!ma) continue; + if(ma->adt && ma->adt->action) + { + fcu = (FCurve*)ma->adt->action->curves.first; + } + } + if ( fcu) return true; base= base->next; } diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 481cacbd4c8..5185458d71c 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -35,6 +35,7 @@ extern "C" #include "DNA_lamp_types.h" #include "DNA_camera_types.h" #include "DNA_armature_types.h" +#include "DNA_material_types.h" #include "BKE_DerivedMesh.h" #include "BKE_fcurve.h" @@ -68,6 +69,8 @@ extern char build_rev[]; #include "COLLADASWConstants.h" #include "COLLADASWBaseInputElement.h" +#include "EffectExporter.h" + #include "collada_internal.h" #include <vector> |