Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/clusterCluck

# Conflicts:
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
#	Engine/source/scene/sceneContainer.h

Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp

@@ -1768,7 +1768,7 @@ void GuiConvexEditorCtrl::submitUndo( UndoType type, const Vector<ConvexShape*>
 	mIsDirty = true;
 }
 
-bool GuiConvexEditorCtrl::_cursorCastCallback(SceneObject* object)
+bool GuiConvexEditorCtrl::_cursorCastCallback( SceneObject* object )
 {
    // Reject anything that's not a ConvexShape.
    return dynamic_cast< ConvexShape* >( object );

Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h

@@ -169,7 +169,7 @@ protected:
    void _renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *matInst );
 
    bool _cursorCast( const Gui3DMouseEvent &event, ConvexShape **hitShape, S32 *hitFace );
-   static bool _cursorCastCallback(SceneObject* object);
+   static bool _cursorCastCallback( SceneObject* object );
 
 protected:
 

Engine/source/scene/sceneContainer.h

@@ -668,7 +668,8 @@ class SceneContainer
       /// @name Line intersection
       /// @{
 
-      typedef bool ( *CastRayCallback )(SceneObject* object);
+
+      typedef bool ( *CastRayCallback )( SceneObject* object );
 
       /// Test against collision geometry -- fast.
       bool castRay( const Point3F &start, const Point3F &end, U32 mask, RayInfo* info, CastRayCallback callback = NULL );