From 758cd523e24a4bed60181647a462bef5427762c3 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 27 Oct 2016 12:37:00 +0200
Subject: [PATCH] Don't use assimp/ prefix when including assimp files

---
 pandatool/src/assimp/assimpLoader.cxx | 2 +-
 pandatool/src/assimp/assimpLoader.h   | 4 ++--
 pandatool/src/assimp/pandaIOStream.h  | 2 +-
 pandatool/src/assimp/pandaIOSystem.h  | 2 +-
 pandatool/src/assimp/pandaLogger.cxx  | 2 +-
 pandatool/src/assimp/pandaLogger.h    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandatool/src/assimp/assimpLoader.cxx b/pandatool/src/assimp/assimpLoader.cxx
index 661286d454..fb383a1b7f 100644
--- a/pandatool/src/assimp/assimpLoader.cxx
+++ b/pandatool/src/assimp/assimpLoader.cxx
@@ -39,7 +39,7 @@
 #include "pandaIOSystem.h"
 #include "pandaLogger.h"
 
-#include "assimp/postprocess.h"
+#include "postprocess.h"
 
 struct BoneWeight {
   CPT(JointVertexTransform) joint_vertex_xform;
diff --git a/pandatool/src/assimp/assimpLoader.h b/pandatool/src/assimp/assimpLoader.h
index 85dd7f59a0..41ac3e1dc6 100644
--- a/pandatool/src/assimp/assimpLoader.h
+++ b/pandatool/src/assimp/assimpLoader.h
@@ -20,8 +20,8 @@
 #include "texture.h"
 #include "pmap.h"
 
-#include "assimp/scene.h"
-#include "assimp/Importer.hpp"
+#include "scene.h"
+#include "Importer.hpp"
 
 class Character;
 class CharacterJointBundle;
diff --git a/pandatool/src/assimp/pandaIOStream.h b/pandatool/src/assimp/pandaIOStream.h
index 913f96a740..cb4ddf251c 100644
--- a/pandatool/src/assimp/pandaIOStream.h
+++ b/pandatool/src/assimp/pandaIOStream.h
@@ -16,7 +16,7 @@
 
 #include "config_assimp.h"
 
-#include "assimp/IOStream.hpp"
+#include "IOStream.hpp"
 
 class PandaIOSystem;
 
diff --git a/pandatool/src/assimp/pandaIOSystem.h b/pandatool/src/assimp/pandaIOSystem.h
index cbf3d9cf6d..f38223381c 100644
--- a/pandatool/src/assimp/pandaIOSystem.h
+++ b/pandatool/src/assimp/pandaIOSystem.h
@@ -17,7 +17,7 @@
 #include "config_assimp.h"
 #include "virtualFileSystem.h"
 
-#include "assimp/IOSystem.hpp"
+#include "IOSystem.hpp"
 
 /**
  * Custom implementation of Assimp::IOSystem.
diff --git a/pandatool/src/assimp/pandaLogger.cxx b/pandatool/src/assimp/pandaLogger.cxx
index d503dc3fbe..cab31e1c06 100644
--- a/pandatool/src/assimp/pandaLogger.cxx
+++ b/pandatool/src/assimp/pandaLogger.cxx
@@ -13,7 +13,7 @@
 
 #include "pandaLogger.h"
 
-#include "assimp/DefaultLogger.hpp"
+#include "DefaultLogger.hpp"
 
 PandaLogger *PandaLogger::_ptr = NULL;
 
diff --git a/pandatool/src/assimp/pandaLogger.h b/pandatool/src/assimp/pandaLogger.h
index 799784e7fc..a9bcbb40af 100644
--- a/pandatool/src/assimp/pandaLogger.h
+++ b/pandatool/src/assimp/pandaLogger.h
@@ -16,7 +16,7 @@
 
 #include "config_assimp.h"
 
-#include "assimp/Logger.hpp"
+#include "Logger.hpp"
 
 /**
  * Custom implementation of Assimp::Logger.  It simply wraps around the