Merging r6468 through r6486 from trunk to ogl-es branch

Also updating ES&ES2 interface to work with removal of IMaterialRendererServices::setBasicRenderStates


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

source/Irrlicht/CMeshSceneNode.h

@@ -12,6 +12,7 @@ namespace irr
 {
 namespace scene
 {
+	class CBufferRenderNode;
 
 	class CMeshSceneNode : public IMeshSceneNode
 	{
@@ -83,6 +84,7 @@ namespace scene
 
 	protected:
 
+		void setUsedBufferRenderNodes(irr::u32 num);
 		void copyMaterials();
 
 		core::array<video::SMaterial> Materials;
@@ -92,8 +94,9 @@ namespace scene
 		IMesh* Mesh;
 		IShadowVolumeSceneNode* Shadow;
 
-		s32 PassCount;
 		bool ReadOnlyMaterials;
+
+		core::array<scene::CBufferRenderNode*> BufferRenderNodes;
 	};
 
 } // end namespace scene