diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-07 02:48:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-08 16:46:28 +0300 |
| commit | 27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (patch) | |
| tree | c2c38e1b4f308ca885dc3c3581560cfbc6833a8e /src/resources/loaders/shaderprogramloader.cpp | |
| parent | d4e28aa97cbce34a0053d3c02cf070ef9065439f (diff) | |
| download | ManaVerse-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.gz ManaVerse-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.bz2 ManaVerse-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.xz ManaVerse-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.zip | |
Move resourcemanager from class to namespace.
Diffstat (limited to 'src/resources/loaders/shaderprogramloader.cpp')
| -rw-r--r-- | src/resources/loaders/shaderprogramloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp index d48e1aa9f..763536a6c 100644 --- a/src/resources/loaders/shaderprogramloader.cpp +++ b/src/resources/loaders/shaderprogramloader.cpp @@ -66,7 +66,7 @@ Resource *Loader::getShaderProgram(const std::string &vertex, const bool isNewShader) { ShaderProgramLoader rl = { vertex, fragment, isNewShader }; - return resourceManager->get("program_" + vertex + " + " + fragment, + return ResourceManager::get("program_" + vertex + " + " + fragment, ShaderProgramLoader::load, &rl); } |