Merge remote-tracking branch 'origin/master' into Rendering

# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h
This commit is contained in:
viktorljung
2015-12-14 19:11:00 +01:00
37 changed files with 1072 additions and 136 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ RawModel::RawModel(std::string fileName)
if (scene == nullptr) {
LOG_ERROR("Failed to load model \"%s\"", fileName.c_str());
LOG_ERROR("Assimp error: %s", importer.GetErrorString());
return;
throw std::runtime_error("Failed to open model file.");
}
auto m = scene->mRootNode->mTransformation;