diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-05 09:18:03 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-05 09:18:03 -0300 |
| commit | 495d059a744b268b0355d0cbfbb9ef30fec865e2 (patch) | |
| tree | 96c7cc2c4bcf3a1f2c62a18ddbe2aaa7a42a44ed /servers | |
| parent | 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (diff) | |
| parent | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/shader_language.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index 6326b5089e..b5f843c114 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -151,6 +151,11 @@ public: /* COMPILER */ + // lame work around to Apple defining this as a macro in 10.12 SDK + #ifdef TYPE_BOOL + #undef TYPE_BOOL + #endif + enum DataType { TYPE_VOID, TYPE_BOOL, |