From 2af70e3c4c0a7713280286dc111c4e16d3eb21b4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 9 Feb 2004 22:56:39 +0000
Subject: [PATCH] From Ronny Krueger:

    In RenderStage.cpp removed erroneous else statement.

    In ShapeDrawable.cpp's PrimitiveShapeVisitor::apply(const Box& box) fixed
    order of the last face.
---
 src/osg/ShapeDrawable.cpp   | 4 ++--
 src/osgUtil/RenderStage.cpp | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/osg/ShapeDrawable.cpp b/src/osg/ShapeDrawable.cpp
index e8e9230bf..2a10a3a8e 100644
--- a/src/osg/ShapeDrawable.cpp
+++ b/src/osg/ShapeDrawable.cpp
@@ -1118,9 +1118,9 @@ void PrimitiveShapeVisitor::apply(const Box& box)
     _functor.vertex(top_2);
     _functor.vertex(top_3);
 
-    _functor.vertex(base_2);
-    _functor.vertex(base_3);
     _functor.vertex(base_4);
+    _functor.vertex(base_3);
+    _functor.vertex(base_2);
     _functor.vertex(base_1);
 
     _functor.end();
diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp
index eece8bacb..6dca853a8 100644
--- a/src/osgUtil/RenderStage.cpp
+++ b/src/osgUtil/RenderStage.cpp
@@ -136,10 +136,7 @@ void RenderStage::drawImplementation(osg::State& state,RenderLeaf*& previous)
         glClearColor( _clearColor[0], _clearColor[1], _clearColor[2], _clearColor[3]);
 
     if (_clearMask & GL_DEPTH_BUFFER_BIT)
-    {
         glClearDepth( _clearDepth);
-    }
-    else
 
     if (_clearMask & GL_STENCIL_BUFFER_BIT)
         glClearStencil( _clearStencil);