diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-11 17:47:21 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-11 17:47:21 +0300 |
commit | 9c102f339d50330ad07d56ae606d705c25383b88 (patch) | |
tree | ae64cf7203ae6341b7558043f86ecde76dedcea3 /source/gameengine | |
parent | ef3aaa32693d60ea108cb4ad85e81d3049e6a880 (diff) | |
parent | 77d633399c7a044190dfcc7f81daf5cda7dddab8 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index ae3c17a52ab..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" |