diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
| commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
| tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_2DFilterManager.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index 82b26749fd1..f379e2eb486 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp @@ -24,7 +24,7 @@ * \ingroup bgerast */ -#define STRINGIFY(A) #A +#include "BLI_utildefines.h" #include "RAS_OpenGLFilters/RAS_Blur2DFilter.h" #include "RAS_OpenGLFilters/RAS_Sharpen2DFilter.h" @@ -43,7 +43,7 @@ #include "RAS_2DFilterManager.h" #include <iostream> -#include "glew-mx.h" +#include "GPU_glew.h" #include <stdio.h> |