Merge revision 4724 from branch to ogl-es:

- Fix SDL device compilation. VideoDriver is now always dropped after Scenemanager and FileSystem after those two to prevent memory-leaks in some situations.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4830 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CIrrDeviceSDL.cpp

@@ -754,7 +754,7 @@ void CIrrDeviceSDL::maximizeWindow()
 }
 
 //! Get the position of this window on screen
-core::position2di getWindowPosition()
+core::position2di CIrrDeviceSDL::getWindowPosition()
 {
     return core::position2di(-1, -1);
 }

source/Irrlicht/CIrrDeviceStub.cpp

@@ -60,14 +60,17 @@ CIrrDeviceStub::~CIrrDeviceStub()
 	if (GUIEnvironment)
 		GUIEnvironment->drop();
 
+	if (SceneManager)
+		SceneManager->drop();
+
 	if (VideoDriver)
 		VideoDriver->drop();
 
 	if (ContextManager)
 		ContextManager->drop();
 
-	if (SceneManager)
-		SceneManager->drop();
+	if ( FileSystem )
+		FileSystem->drop();
 
 	if (InputReceivingSceneManager)
 		InputReceivingSceneManager->drop();
@@ -366,25 +369,25 @@ bool CIrrDeviceStub::activateAccelerometer(float updateInterval)
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::deactivateAccelerometer()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isAccelerometerActive()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isAccelerometerAvailable()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::activateGyroscope(float updateInterval)
 {
@@ -396,37 +399,37 @@ bool CIrrDeviceStub::deactivateGyroscope()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isGyroscopeActive()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isGyroscopeAvailable()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::activateDeviceMotion(float updateInterval)
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::deactivateDeviceMotion()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isDeviceMotionActive()
 {
     return false;
 }
-    
+
 //! No-op in this implementation
 bool CIrrDeviceStub::isDeviceMotionAvailable()
 {