Merge revisions r5516 through r5518 from trunk to ogl-es.

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

include/IVideoDriver.h

@@ -390,7 +390,8 @@ namespace video
 		//! Creates an empty texture of specified size.
 		/** \param size: Size of the texture.
 		\param name A name for the texture. Later calls to
-		getTexture() with this name will return this texture
+		getTexture() with this name will return this texture.
+		The name can _not_ be empty.
 		\param format Desired color format of the texture. Please note
 		that the driver may choose to create the texture in another
 		color format.
@@ -402,7 +403,8 @@ namespace video
 
 		//! Creates a texture from an IImage.
 		/** \param name A name for the texture. Later calls of
-		getTexture() with this name will return this texture
+		getTexture() with this name will return this texture.
+		The name can _not_ be empty.
 		\param image Image the texture is created from.
 		\param mipmapData Optional pointer to a mipmaps data.
 		If this parameter is not given, the mipmaps are derived from image.
@@ -419,7 +421,8 @@ namespace video
 
 		//! Creates a texture from an IImage.
 		/** \param name A name for the texture. Later calls of
-		getTexture() with this name will return this texture
+		getTexture() with this name will return this texture.
+		The name can _not_ be empty.
 		\param image Image the texture is created from.
 		\return Pointer to the newly created texture. This pointer
 		should not be dropped. See IReferenceCounted::drop() for more
@@ -428,6 +431,7 @@ namespace video
 
 		//! Creates a cubemap texture from loaded IImages.
 		/** \param name A name for the texture. Later calls of getTexture() with this name will return this texture.
+		The name can _not_ be empty.
 		\param imagePosX Image (positive X) the texture is created from.
 		\param imageNegX Image (negative X) the texture is created from.
 		\param imagePosY Image (positive Y) the texture is created from.
@@ -443,7 +447,8 @@ namespace video
 		height should be a power of two (e.g. 64, 128, 256, 512, ...)
 		and it should not be bigger than the backbuffer, because it
 		shares the zbuffer with the screen buffer.
-		\param name An optional name for the RTT.
+		\param name A name for the texture. Later calls of getTexture() with this name will return this texture.
+		The name can _not_ be empty.
 		\param format The color format of the render target. Floating point formats are supported.
 		\return Pointer to the created texture or 0 if the texture
 		could not be created. This pointer should not be dropped. See
@@ -966,7 +971,7 @@ namespace video
 		virtual void draw2DRectangleOutline(const core::recti& pos,
 				SColor color=SColor(255,255,255,255)) =0;
 
-		//! Draws a 2d line. 
+		//! Draws a 2d line.
 		/** In theory both start and end will be included in coloring.
 		BUG: Currently hardware drivers (d3d/opengl) ignore the last pixel
 		(they use the so called "diamond exit rule" for drawing lines).

include/matrix4.h

@@ -60,6 +60,19 @@ namespace core
 			//! Default constructor
 			/** \param constructor Choose the initialization style */
 			CMatrix4( eConstructor constructor = EM4CONST_IDENTITY );
+
+			//! Constructor with value initialization
+			CMatrix4(const T& r0c0, const T& r0c1, const T& r0c2, const T& r0c3,
+			         const T& r1c0, const T& r1c1, const T& r1c2, const T& r1c3,
+			         const T& r2c0, const T& r2c1, const T& r2c2, const T& r2c3,
+			         const T& r3c0, const T& r3c1, const T& r3c2, const T& r3c3)
+			{
+				M[0]  = r0c0; M[1]  = r0c1; M[2]  = r0c2; M[3]  = r0c3;
+				M[4]  = r1c0; M[5]  = r1c1; M[6]  = r1c2; M[7]  = r1c3;
+				M[8]  = r2c0; M[9]  = r2c1; M[10] = r2c2; M[11] = r2c3;
+				M[12] = r3c0; M[13] = r3c1; M[14] = r3c2; M[15] = r3c3;
+			}
+
 			//! Copy constructor
 			/** \param other Other matrix to copy from
 			\param constructor Choose the initialization style */

source/Irrlicht/CNullDriver.cpp

@@ -438,7 +438,10 @@ ITexture* CNullDriver::addTexture(const core::dimension2d<u32>& size, const io::
 	}
 
 	if (0 == name.size())
+	{
+		os::Printer::log("Could not create ITexture, texture needs to have a non-empty name.", ELL_WARNING);
 		return 0;
+	}
 
 	IImage* image = new CImage(format, size);
 	ITexture* t = 0;
@@ -464,7 +467,13 @@ ITexture* CNullDriver::addTexture(const core::dimension2d<u32>& size, const io::
 
 ITexture* CNullDriver::addTexture(const io::path& name, IImage* image)
 {
-	if (0 == name.size() || !image)
+	if (0 == name.size())
+	{
+		os::Printer::log("Could not create ITexture, texture needs to have a non-empty name.", ELL_WARNING);
+		return 0;
+	}
+
+	if (!image)
 		return 0;
 
 	ITexture* t = 0;