Browse Source

Merge pull request #1807 from Azaezel/boxBaseBorked

clang catch: boxBase's getPlanePointIndex method wasn't returning values in all cases.
Areloch 8 years ago
parent
commit
1a851f167d
1 changed files with 5 additions and 3 deletions
  1. 5 3
      Engine/source/math/mBoxBase.h

+ 5 - 3
Engine/source/math/mBoxBase.h

@@ -49,7 +49,8 @@ class BoxBase
          FarTopLeft,
          FarTopLeft,
          FarBottomLeft,
          FarBottomLeft,
 
 
-         NUM_POINTS
+         NUM_POINTS,
+		 InvalidPoint = NUM_POINTS
       };
       };
 
 
       /// Return the point index for the opposite corner of @a p.
       /// Return the point index for the opposite corner of @a p.
@@ -192,8 +193,6 @@ class BoxBase
                   default: AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid index" );
                   default: AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid index" );
                }
                }
                break;
                break;
-            default:
-               AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid plane" );
             case BottomPlane:
             case BottomPlane:
                switch( i )
                switch( i )
                {
                {
@@ -204,7 +203,10 @@ class BoxBase
                   default: AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid index" );
                   default: AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid index" );
                }
                }
                break;
                break;
+            default:
+               AssertFatal( false, "BoxBase::getPlanePointIndex - Invalid plane" );
          }
          }
+        return InvalidPoint;
       }
       }
 
 
       /// Indices for the edges of the box.
       /// Indices for the edges of the box.