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 /platform/osx/os_osx.h | |
| parent | 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (diff) | |
| parent | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/osx/os_osx.h')
| -rw-r--r-- | platform/osx/os_osx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 8c4eb28ff0..a547e318c8 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -35,7 +35,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/visual_server.h" -#include "servers/visual/visual_server_wrap_mt.h" +// #include "servers/visual/visual_server_wrap_mt.h" #include "servers/visual/rasterizer.h" #include "servers/physics_server.h" #include "servers/audio/audio_server_sw.h" @@ -58,7 +58,8 @@ class OS_OSX : public OS_Unix { public: bool force_quit; - Rasterizer *rasterizer; +// rasterizer seems to no longer be given to visual server, its using GLES3 directly? +// Rasterizer *rasterizer; VisualServer *visual_server; List<String> args; |