Merge branch 'master' of github.com:assimp/assimp into gcc-fixes

pull/28/head
Alexander Gessler 2013-04-08 23:21:33 +02:00
commit afe1dd8c02
1 changed files with 4 additions and 0 deletions

View File

@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/types.h" #include "../include/assimp/types.h"
#ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
struct aiNode; struct aiNode;
#include "3DSHelper.h" #include "3DSHelper.h"
@ -271,6 +273,8 @@ protected:
bool bIsPrj; bool bIsPrj;
}; };
#endif // !! ASSIMP_BUILD_NO_3DS_IMPORTER
} // end of namespace Assimp } // end of namespace Assimp
#endif // AI_3DSIMPORTER_H_INC #endif // AI_3DSIMPORTER_H_INC