merge master and mv FindDevIL to cmake-modules

2017-03-05 23:07:06 +08:00
parent 34906071fc d402825d03
commit 7226d73682
35 changed files with 1853 additions and 1680 deletions
--- a/code/ImporterRegistry.cpp
+++ b/code/ImporterRegistry.cpp
@@ -46,6 +46,9 @@ directly (unless you are adding new loaders), instead use the
 corresponding preprocessor flag to selectively disable formats.
 */

+#include <vector>
+#include "BaseImporter.h"
+
 // ------------------------------------------------------------------------------------------------
 // Importers
 // (include_new_importers_here)