Merge branch 'master' of https://github.com/supertuxkart/stk-code into se

data/shaders/instanced_object_pass.vert

@@ -14,6 +14,8 @@ in vec3 Position;
 in vec3 Normal;
 in vec4 Color;
 in vec2 Texcoord;
+in vec3 Tangent;
+in vec3 Bitangent;
 
 in vec3 Origin;
 in vec3 Orientation;

lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp

@@ -185,15 +185,19 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		}
 		#endif // #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-		// Reset fullscreen resolution change
-		switchToFullscreen(true);
-
 		if (SoftwareImage)
 			XDestroyImage(SoftwareImage);
 
 		if (!ExternalWindow)
 		{
 			XDestroyWindow(display,window);
+		}
+		
+		// Reset fullscreen resolution change
+		switchToFullscreen(true);		
+		
+		if (!ExternalWindow)
+		{
 			XCloseDisplay(display);
 		}
 	}