Merging r6519 through r6561 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6562 dfc29bdd-3216-0410-991c-e03cc46cb475
2023-10-16 21:17:56 +00:00
parent e9c494503d
commit 849336343d
169 changed files with 465 additions and 511 deletions
--- a/source/Irrlicht/CColladaFileLoader.cpp
+++ b/source/Irrlicht/CColladaFileLoader.cpp
@@ -7,6 +7,7 @@

 #include "CColladaFileLoader.h"
 #include "CMeshTextureLoader.h"
+#include "CAttributes.h"
 #include "os.h"
 #include "IXMLReader.h"
 #include "IDummyTransformationSceneNode.h"
@@ -21,6 +22,7 @@
 #include "IMeshCache.h"
 #include "IMeshSceneNode.h"
 #include "CDynamicMeshBuffer.h"
+#include "IVideoDriver.h"
 #include "irrMap.h"

 #ifdef _DEBUG