summaryrefslogtreecommitdiffstats
path: root/unityplugin
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-29 07:37:10 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-29 07:37:10 +0000
commit095bc74fecc2ce6242d99dadc91a66f874aa9cbb (patch)
tree0d6192fd4de762e2325e73d2ec7bd865d56984af /unityplugin
parenttravis: enabled tests (diff)
parentUpdated submodules - fixed linux build problems (diff)
downloadDiligentEngine-095bc74fecc2ce6242d99dadc91a66f874aa9cbb.tar.gz
DiligentEngine-095bc74fecc2ce6242d99dadc91a66f874aa9cbb.zip
Merge branch 'master' of https://github.com/DiligentGraphics/DiligentEngine
Diffstat (limited to 'unityplugin')
-rw-r--r--unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
index 97c47b6..16fa4cf 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
@@ -42,6 +42,9 @@
# ifdef Success
# undef Success
# endif
+# ifdef None
+# undef None
+# endif
#elif PLATFORM_MACOS