diff options
author | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:29:18 +0100 |
---|---|---|
committer | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:29:18 +0100 |
commit | ae6a103946e437ca85cc69c5fc2cbf68d35ffeae (patch) | |
tree | a0bd09748c68950353f05d245bed4de470548fc6 /src/crepe/api/Texture.cpp | |
parent | a5d3564f6d051986376c98abb9c098a8a7183fe0 (diff) | |
parent | 5b248d068a94902be9ca4d00fe07d551f64c49b9 (diff) |
Merge remote-tracking branch 'origin/master' into max/gameobject
Diffstat (limited to 'src/crepe/api/Texture.cpp')
-rw-r--r-- | src/crepe/api/Texture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp index 481ef7c..8fc5c13 100644 --- a/src/crepe/api/Texture.cpp +++ b/src/crepe/api/Texture.cpp @@ -1,12 +1,12 @@ #include <SDL2/SDL_render.h> -#include "util/log.h" +#include "../facade/SDLContext.h" +#include "../util/log.h" #include "Asset.h" -#include "SDLContext.h" #include "Texture.h" -using namespace crepe::api; +using namespace crepe; using namespace std; Texture::Texture(unique_ptr<Asset> res) { |