aboutsummaryrefslogtreecommitdiffstats
path: root/yage/render/shader.h
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-01-10 18:38:31 +0000
committerYann Herklotz <ymherklotz@gmail.com>2018-01-10 18:38:31 +0000
commit21ebdb0b3206bef69fee2b5f9b34573a516eddb4 (patch)
tree5fac3b692fecc7899f8c746e2116cdf6e2eee7b1 /yage/render/shader.h
parentfe9fa3a98166718171b7687c24c289b4a2b5cf44 (diff)
parent5fe329fe40c296a4a3dce9bc5543419ac954e4b0 (diff)
downloadYAGE-21ebdb0b3206bef69fee2b5f9b34573a516eddb4.tar.gz
YAGE-21ebdb0b3206bef69fee2b5f9b34573a516eddb4.zip
Merge branch 'develop'
Diffstat (limited to 'yage/render/shader.h')
-rw-r--r--yage/render/shader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/yage/render/shader.h b/yage/render/shader.h
index 7f4d2f9d..086b7b70 100644
--- a/yage/render/shader.h
+++ b/yage/render/shader.h
@@ -9,8 +9,8 @@
#ifndef YAGE_RENDER_SHADER_H
#define YAGE_RENDER_SHADER_H
-#include <glm/glm.hpp>
#include <glad/glad.h>
+#include <glm/glm.hpp>
#include <string>