Merge fixes

2016-03-13 16:14:13 +01:00
parent 44f46cda8d
commit 04288e5243
10 changed files with 102 additions and 102 deletions
@@ -21,7 +21,7 @@ struct SpriteJob : RenderJob
    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
        : RenderJob()
    {
-        Model = ResourceManager::Load<::Model>((std::string)cSprite["Model"]);
+        Model = ResourceManager::Load<::Model>(cSprite["Model"]);
        ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
        TextureID = 0;