Merging r5809 through r5810 from trunk to ogl-es branch

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

changes.txt

@@ -9,6 +9,7 @@ Changes in ogl-es (not yet released - will be merged with trunk at some point)
 
 --------------------------
 Changes in 1.9 (not yet released)
+- Add ITexture::getOriginalColorFormat to access color format of images used to create a texture
 - Add IMemoryReadFile interface which allows direct access to memory block used as file.
 - Add IReadFile::getType() interface to all users to find out what kind of class implements that interface.
 - .dae/Collada reader/writer now handle whitespace in texture-filenames with escape characters (handle them as xs:anyURI).

include/ITexture.h

@@ -226,6 +226,12 @@ public:
 	/** \return The color format of texture. */
 	ECOLOR_FORMAT getColorFormat() const { return ColorFormat; };
 
+	//! Get the original color format
+	/** When create textures from image data we will often use different color formats.
+	For example depending on driver TextureCreationFlag's. 
+	This can give you the original format which the image used to create the texture had	*/
+	ECOLOR_FORMAT getOriginalColorFormat() const { return OriginalColorFormat; };
+
 	//! Get pitch of the main texture (in bytes).
 	/** The pitch is the amount of bytes used for a row of pixels in a
 	texture.

source/Irrlicht/CCubeSceneNode.cpp

@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
+#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
 #include "CCubeSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
@@ -243,4 +243,4 @@ ISceneNode* CCubeSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag
 } // end namespace scene
 } // end namespace irr
 
-#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE
+#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE_

source/Irrlicht/CSceneManager.cpp

@@ -138,9 +138,9 @@
 #include "CB3DMeshWriter.h"
 #endif
 
-#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
+#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
 #include "CCubeSceneNode.h"
-#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE
+#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE_
 #ifdef _IRR_COMPILE_WITH_SPHERE_SCENENODE_
 #include "CSphereSceneNode.h"
 #endif
@@ -604,7 +604,7 @@ IMeshSceneNode* CSceneManager::addCubeSceneNode(f32 size, ISceneNode* parent,
 		s32 id, const core::vector3df& position,
 		const core::vector3df& rotation, const core::vector3df& scale)
 {
-#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
+#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
 	if (!parent)
 		parent = this;