Merge branch 'GarageGames/master' into ueberengine-dev

Conflicts:
	Engine/source/windowManager/sdl/sdlWindowMgr.cpp
	Tools/CMake/torque3d.cmake

3.10 final update

Engine/source/platformSDL/sdlPlatformGL.cpp

@@ -6,6 +6,8 @@
 #include "gfx/gl/tGL/tWGL.h"
 #endif
 
+#include "gfx/gl/gfxGLUtils.h"
+
 namespace PlatformGL
 {
 
@@ -69,6 +71,9 @@ namespace PlatformGL
 
    void setVSync(const int i)
    {
+      PRESERVE_FRAMEBUFFER();
+      // Nvidia needs to have the default framebuffer bound or the vsync calls fail
+      glBindFramebuffer(GL_FRAMEBUFFER, 0);
        if( i == 1 || i == -1 )
        {
            int ret = SDL_GL_SetSwapInterval(-1);
@@ -78,6 +83,7 @@ namespace PlatformGL
        }
        else
            SDL_GL_SetSwapInterval(0);
+
    }
 
 }

Engine/source/platformSDL/threads/semaphore.cpp

@@ -25,8 +25,9 @@
 #include <SDL.h>
 #include <SDL_thread.h>
 
-struct PlatformSemaphore
+class PlatformSemaphore
 {
+public:
    SDL_sem *semaphore;
 
    PlatformSemaphore(S32 initialCount)