Really fixed all merge conflicts, found by The Anaconda.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1194 dfc29bdd-3216-0410-991c-e03cc46cb475

include/ISceneManager.h

@@ -318,6 +318,29 @@ namespace scene
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;
 
+		//! adds Volume Lighting Scene Node.
+		//! the returned pointer must not be dropped.
+		/** Example Usage:
+			scene::ISceneNode * n = smgr->addVolumeLightSceneNode(NULL, -1,
+						32, 32, //Subdivide U/V
+						video::SColor(0, 180, 180, 180),   //foot color
+						video::SColor(0, 0, 0, 0)         //tail color
+						);
+			if (n)
+			{
+				n->setScale(core::vector3df(46.0f, 45.0f, 46.0f));
+				n->getMaterial(0).setTexture(0, smgr->getVideoDriver()->getTexture("lightFalloff.png"));
+			}
+		**/
+		virtual ISceneNode* addVolumeLightSceneNode(ISceneNode* parent=0, s32 id=-1,
+			const u32 subdivU = 32, const u32 subdivV = 32,
+			const video::SColor foot = video::SColor(51, 0, 230, 180),
+			const video::SColor tail = video::SColor(0, 0, 0, 0),
+			const core::vector3df& position = core::vector3df(0,0,0),
+			const core::vector3df& rotation = core::vector3df(0,0,0),
+			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) = 0;
+
+
 		//! Adds a test scene node for test purposes to the scene.
 		/** It is a simple cube of (1,1,1) size.
 		\param size: Size of the cube.