diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-20 17:59:48 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-20 17:59:48 +0000 |
commit | cc35bb2471c6d3fd695e3f8985ef168cda3fb39c (patch) | |
tree | 2cf90c623fdb75086e486b368c5d65f35a839c10 /yage/core/imageloader.cpp | |
parent | 1fcd6a0fe38a8db2c6d317c2735419aa04e9cd83 (diff) | |
parent | b885965a6375f98d6bec63a43233461f9f42006d (diff) | |
download | YAGE-cc35bb2471c6d3fd695e3f8985ef168cda3fb39c.tar.gz YAGE-cc35bb2471c6d3fd695e3f8985ef168cda3fb39c.zip |
Merge branch 'develop'
Diffstat (limited to 'yage/core/imageloader.cpp')
-rw-r--r-- | yage/core/imageloader.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/yage/core/imageloader.cpp b/yage/core/imageloader.cpp index ae67a94a..fb4d1e44 100644 --- a/yage/core/imageloader.cpp +++ b/yage/core/imageloader.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * imageloader.cpp +/** --------------------------------------------------------------------------- + * @file: imageloader.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. @@ -7,11 +7,9 @@ */ #include "imageloader.h" +#include "texture.h" -#ifndef UNIT_TESTS #include <glad/glad.h> -#endif - #include <yage/core/iomanager.h> #include <yage/core/picopng.h> |