Merge branch 'master' of https://github.com/assimp/assimp

2015-04-16 11:10:21 +02:00
parent ead3e8d275 c61f876090
commit 444a77e170
289 changed files with 1360 additions and 551 deletions
--- a/code/OpenGEXImporter.cpp
+++ b/code/OpenGEXImporter.cpp
@@ -39,12 +39,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER

-#include "AssimpPCH.h"
 #include "OpenGEXImporter.h"
 #include "DefaultIOSystem.h"
 #include "MakeVerboseFormat.h"

 #include <openddlparser/OpenDDLParser.h>
+#include "../include/assimp/scene.h"
+

 #include <vector>