forked from bartvdbraak/blender
Assorted GCC fixes for OpenCOLLADA support
This commit is contained in:
parent
7245280f6c
commit
e161c22dc2
@ -35,7 +35,7 @@
|
||||
#include "BKE_action.h"
|
||||
#include "BKE_armature.h"
|
||||
|
||||
#include "BLI_listBase.h"
|
||||
#include "BLI_listbase.h"
|
||||
|
||||
#include "GeometryExporter.h"
|
||||
#include "ArmatureExporter.h"
|
||||
|
@ -186,7 +186,7 @@ void forEachMaterialInScene(Scene *sce, Functor &f)
|
||||
{
|
||||
ForEachMaterialFunctor<Functor> matfunc(&f);
|
||||
GeometryFunctor gf;
|
||||
gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor>>(sce, matfunc);
|
||||
gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor> >(sce, matfunc);
|
||||
}
|
||||
|
||||
// OB_MESH is assumed
|
||||
|
@ -24,6 +24,10 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#ifndef WIN32
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
#include "COLLADAFWMeshPrimitive.h"
|
||||
#include "COLLADAFWMeshVertexData.h"
|
||||
#include "COLLADAFWPolygons.h"
|
||||
|
@ -24,6 +24,10 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#ifndef WIN32
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include "BKE_object.h"
|
||||
#include "DNA_armature_types.h"
|
||||
#include "DNA_modifier_types.h"
|
||||
|
Loading…
Reference in New Issue
Block a user