merge fixes

2015-12-08 10:15:12 +01:00
parent e7427bf3ad
commit d556f964e6
2 changed files with 23 additions and 25 deletions
@@ -38,9 +38,9 @@ void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue)
 {
   for(auto& modelC : world->GetComponents("Model")) {
       ModelJob job;
-       std::string modelFile = modelC["ModelFile"];
+       std::string resource = modelC["Resource"];
       glm::vec4 color = modelC["Color"];
-       Model* model = ResourceManager::Load<Model>(modelFile);
+       Model* model = ResourceManager::Load<Model>(resource);

       for (auto texGroup : model->TextureGroups) {
           job.TextureID = (texGroup.Texture) ? texGroup.Texture->ResourceID : 0;