Merging 1.8 branch:

- r4389: Fix crashes in CCubeSceneNode::clone and CSphereSceneNode::clone (reported by  marsupial)
- r4387/r4390: fixed getDepthFunction in IQ3Shader which always returned ECFN_EQUAL due to missing break (found by the cppcheck tool)
- r4382: Fix the clipping in the listbox drawing which was only showing the right line of the sunken pane (reported by Mloren and Abraxas).


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

changes.txt

@@ -6,6 +6,9 @@ Changes in 1.9 (not yet released)
 --------------------------
 Changes in 1.8.1 (not yet released)
 
+ - Fix crashes in CCubeSceneNode::clone and CSphereSceneNode::clone (reported by  marsupial)
+ - Fix the clipping in the listbox drawing which was only showing the right line of the sunken pane (reported by Mloren and Abraxas).
+ - Initialize slider in example 05 correct (reported by Zerochen)
  - Fix crash in CMeshSceneNode::clone when the mesh had no shadow (reported by  christianclavet, bug-fix found by Nadro)
 
 --------------------------
@@ -586,7 +589,9 @@ The following names can be queried for the given types:
  - Support new OpenGL 2.x shader creation
 
 -----------------------------
-Changes in 1.7.4
+Changes in 1.7.4 (not yet released)
+
+ - fixed getDepthFunction in IQ3Shader which always returned ECFN_EQUAL due to missing break (found by the cppcheck tool)
 
  - STL loader improved to handle arbitrary file starts
 

include/IQ3Shader.h

@@ -204,6 +204,7 @@ namespace quake3
 		{
 			case 0:
 				ret = video::ECFN_LESSEQUAL;
+				break;
 			case 1:
 				ret = video::ECFN_EQUAL;
 				break;

source/Irrlicht/CCubeSceneNode.cpp

@@ -221,7 +221,8 @@ ISceneNode* CCubeSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag
 	nb->cloneMembers(this, newManager);
 	nb->getMaterial(0) = getMaterial(0);
 	nb->Shadow = Shadow;
-	nb->Shadow->grab();
+	if ( nb->Shadow )
+		nb->Shadow->grab();
 
 	if ( newParent )
 		nb->drop();

source/Irrlicht/CGUIListBox.cpp

@@ -511,7 +511,7 @@ void CGUIListBox::draw()
 	clientClip.clipAgainst(AbsoluteClippingRect);
 
 	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT), true,
-		DrawBack, frameRect, &clientClip);
+		DrawBack, frameRect, &AbsoluteClippingRect);
 
 	if (clipRect)
 		clientClip.clipAgainst(*clipRect);

source/Irrlicht/CSphereSceneNode.cpp

@@ -186,7 +186,8 @@ ISceneNode* CSphereSceneNode::clone(ISceneNode* newParent, ISceneManager* newMan
 	nb->cloneMembers(this, newManager);
 	nb->getMaterial(0) = Mesh->getMeshBuffer(0)->getMaterial();
 	nb->Shadow = Shadow;
-	nb->Shadow->grab();
+	if ( nb->Shadow )
+		nb->Shadow->grab();
 
 	if ( newParent )
 		nb->drop();