From b811207406b3359f3e63eda3f35a0d624e1cca39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 4 Mar 2019 10:11:29 +0100 Subject: More style cleanup... --- core/os/os.h | 2 +- drivers/gles2/shaders/scene.glsl | 1 - platform/osx/os_osx.mm | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/os/os.h b/core/os/os.h index 30cfb32b89..ebfe7d20dc 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -518,7 +518,7 @@ public: bool is_restart_on_exit_set() const; List get_restart_on_exit_arguments() const; - virtual void process_and_drop_events() { } + virtual void process_and_drop_events() {} OS(); virtual ~OS(); }; diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index e3c6966e21..3b0bca982d 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -415,7 +415,6 @@ void main() { world_matrix = world_matrix * bone_transform; } - #endif #ifdef USE_INSTANCING diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index a2f266f995..027a4e76f6 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -2580,7 +2580,6 @@ void OS_OSX::force_process_input() { process_events(); // get rid of pending events joypad_osx->process_joypads(); - } void OS_OSX::run() { -- cgit v1.2.3