From 9639b10829fb73ca2557dab9596152447b31e06d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 24 Jun 2016 10:45:24 +0100
Subject: [PATCH] Fixed indentation and added check against NULL

---
 src/osgShadow/MinimalCullBoundsShadowMap.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/osgShadow/MinimalCullBoundsShadowMap.cpp b/src/osgShadow/MinimalCullBoundsShadowMap.cpp
index b01193848..c582cf617 100644
--- a/src/osgShadow/MinimalCullBoundsShadowMap.cpp
+++ b/src/osgShadow/MinimalCullBoundsShadowMap.cpp
@@ -320,7 +320,8 @@ osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
                 *ptrModelToWorld = NULL;
 
     // compute bounding boxes but skip old ones (placed at the end as NULLs)
-    for( RenderLeafList::iterator it = rll.begin(); it != rll.end(); ++it ) {
+    for( RenderLeafList::iterator it = rll.begin(); it != rll.end(); ++it )
+    {
         // we actually allow to pass one element behind end to flush bb queue
         osgUtil::RenderLeaf *rl = *it;
         if( !rl ) break;
@@ -335,8 +336,8 @@ osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
         if( !bb.valid() ) continue;
 
         // Stay as long as possible in model space to minimize matrix ops
-        if( rl->_modelview != modelview || rl->_projection != projection ) {
-
+        if( rl->_modelview != modelview || rl->_projection != projection )
+        {
             projection = rl->_projection;
             if( projection.valid() )
             {
@@ -346,7 +347,9 @@ osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
                    viewToWorld = *ptrProjection * projectionToWorld;
                }
                ptrViewToWorld = &viewToWorld;
-            } else {
+            }
+            else
+            {
                ptrViewToWorld = &projectionToWorld;
             }
 
@@ -355,12 +358,14 @@ osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
             {
                 modelToWorld = *modelview.get() * *ptrViewToWorld;
                 ptrModelToWorld = &modelToWorld;
-            } else {
+            }
+            else
+            {
                 ptrModelToWorld = ptrViewToWorld;
             }
         }
 
-        if( CheckAndMultiplyBoxIfWithinPolytope( bb, *ptrModelToWorld, p ) )
+        if( ptrModelToWorld && CheckAndMultiplyBoxIfWithinPolytope( bb, *ptrModelToWorld, p ) )
             bbResult.expandBy( bb );
     }