Merge remote-tracking branch 'origin/master'

2019-02-22 10:44:19 +01:00
parent e63fcf018e b6cdc3193d
commit 099b1bddc5
3 changed files with 8 additions and 6 deletions
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -147,6 +147,8 @@ bool Shader::reload()
        destroy();
        return load(m_path);
    }
+    
+    return false;
 }

 bool Shader::create(const char* vertex, const char* fragment)