diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-10 18:38:31 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-10 18:38:31 +0000 |
| commit | 21ebdb0b3206bef69fee2b5f9b34573a516eddb4 (patch) | |
| tree | 5fac3b692fecc7899f8c746e2116cdf6e2eee7b1 /yage/core/resourcemanager.cpp | |
| parent | fe9fa3a98166718171b7687c24c289b4a2b5cf44 (diff) | |
| parent | 5fe329fe40c296a4a3dce9bc5543419ac954e4b0 (diff) | |
| download | YAGE-21ebdb0b3206bef69fee2b5f9b34573a516eddb4.tar.gz YAGE-21ebdb0b3206bef69fee2b5f9b34573a516eddb4.zip | |
Merge branch 'develop'
Diffstat (limited to 'yage/core/resourcemanager.cpp')
| -rw-r--r-- | yage/core/resourcemanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp index ec3761b8..2105f7e0 100644 --- a/yage/core/resourcemanager.cpp +++ b/yage/core/resourcemanager.cpp @@ -14,7 +14,8 @@ namespace yage TextureCache ResourceManager::texture_cache_; -Texture ResourceManager::getTexture(const std::string &texture_path, int x, int y) +Texture ResourceManager::getTexture(const std::string &texture_path, int x, + int y) { return texture_cache_.getTexture(texture_path, x, y); } |