diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-20 20:21:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-20 20:21:02 +0300 |
| commit | 8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326 (patch) | |
| tree | 2f4ceaa60c276c2948e6acbf79fefd999f29cd6e /src/render/shaders | |
| parent | c4269ec3066959725f0f1d7670a14eadc8831a76 (diff) | |
| download | plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.gz plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.bz2 plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.xz plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.zip | |
Fix regal and nacl conflict in headers.
Diffstat (limited to 'src/render/shaders')
| -rw-r--r-- | src/render/shaders/shaderprogram.cpp | 2 | ||||
| -rw-r--r-- | src/render/shaders/shadersmanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp index e239a3eb7..1583ceee9 100644 --- a/src/render/shaders/shaderprogram.cpp +++ b/src/render/shaders/shaderprogram.cpp @@ -22,10 +22,10 @@ #include "render/shaders/shaderprogram.h" +#include "render/opengl/mgl.h" #ifdef __native_client__ #include "render/opengl/naclglfunctions.h" #endif -#include "render/opengl/mgl.h" #include "render/shaders/shader.h" diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 724327b07..70f635ee8 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -25,10 +25,10 @@ #include "configuration.h" #include "logger.h" +#include "render/opengl/mgl.h" #ifdef __native_client__ #include "render/opengl/naclglfunctions.h" #endif -#include "render/opengl/mgl.h" #include "render/shaders/shader.h" #include "render/shaders/shaderprogram.h" |