kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Assorted GCC fixes for OpenCOLLADA support

Browse Source
This commit is contained in:
Nathan Letwory 2010-10-06 12:04:56 +00:00
parent 7245280f6c
commit e161c22dc2
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/ArmatureExporter.cpp
View File

@ -35,7 +35,7 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_armature.h" #include "BKE_armature.h"
#include "BLI_listBase.h" #include "BLI_listbase.h"
#include "GeometryExporter.h" #include "GeometryExporter.h"
#include "ArmatureExporter.h" #include "ArmatureExporter.h"

2
source/blender/collada/DocumentExporter.cpp
View File

@ -186,7 +186,7 @@ void forEachMaterialInScene(Scene *sce, Functor &f)
{ {
ForEachMaterialFunctor<Functor> matfunc(&f); ForEachMaterialFunctor<Functor> matfunc(&f);
GeometryFunctor gf; GeometryFunctor gf;
gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor>>(sce, matfunc); gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor> >(sce, matfunc);
} }
// OB_MESH is assumed // OB_MESH is assumed

4
source/blender/collada/MeshImporter.cpp
View File

@ -24,6 +24,10 @@
#include <algorithm> #include <algorithm>
#ifndef WIN32
#include <iostream>
#endif
#include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWMeshPrimitive.h"
#include "COLLADAFWMeshVertexData.h" #include "COLLADAFWMeshVertexData.h"
#include "COLLADAFWPolygons.h" #include "COLLADAFWPolygons.h"

4
source/blender/collada/SkinInfo.cpp
View File

@ -24,6 +24,10 @@
#include <algorithm> #include <algorithm>
#ifndef WIN32
#include <stdint.h>
#endif
#include "BKE_object.h" #include "BKE_object.h"
#include "DNA_armature_types.h" #include "DNA_armature_types.h"
#include "DNA_modifier_types.h" #include "DNA_modifier_types.h"