Merged revisions 2778:2832 from 1.5 branch. Fix a driver feature return value...

Merged revisions 2778:2832 from 1.5 branch. Fix a driver feature return value and a render state bug for OpenGL.

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

source/Irrlicht/COpenGLExtensionHandler.cpp

@@ -517,6 +517,8 @@ bool COpenGLExtensionHandler::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 	{
 	case EVDF_RENDER_TO_TARGET:
 		return true;
+	case EVDF_HARDWARE_TL:
+		return true; // we cannot tell other things
 	case EVDF_MULTITEXTURE:
 		return MultiTextureExtension;
 	case EVDF_BILINEAR_FILTER:

source/Irrlicht/CSceneManager.cpp

@@ -1326,6 +1326,7 @@ void CSceneManager::drawAll()
 	video::IVideoDriver* driver = getVideoDriver();
 	if ( driver )
 	{
+		driver->setMaterial(video::SMaterial());
 		driver->setTransform ( video::ETS_PROJECTION, core::IdentityMatrix );
 		driver->setTransform ( video::ETS_VIEW, core::IdentityMatrix );
 		driver->setTransform ( video::ETS_WORLD, core::IdentityMatrix );
@@ -1914,6 +1915,9 @@ void CSceneManager::removeAll()
 {
 	ISceneNode::removeAll();
 	setActiveCamera(0);
+	// Make sure the driver is reset, might need a more complex method at some point
+	if (Driver)
+		Driver->setMaterial(video::SMaterial());
 }