From da492a589e7900602debcb74aad1c3aee3acb16a Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Tue, 21 May 2019 19:32:17 -0500 Subject: [PATCH] mac compilation correction - casting flaw --- Engine/source/T3D/convexShape.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/convexShape.cpp b/Engine/source/T3D/convexShape.cpp index b9a1ddcb1..2b6fa2448 100644 --- a/Engine/source/T3D/convexShape.cpp +++ b/Engine/source/T3D/convexShape.cpp @@ -724,7 +724,7 @@ void ConvexShape::prepRenderImage( SceneRenderState *state ) // We sort by the material then vertex buffer. ri->defaultKey = matInst->getStateHint(); - ri->defaultKey2 = (U32)ri->vertBuff; // Not 64bit safe! + ri->defaultKey2 = (U32)(uintptr_t)ri->vertBuff; // Not 64bit safe! // Submit our RenderInst to the RenderPassManager state->getRenderPass()->addInst(ri); @@ -776,7 +776,7 @@ void ConvexShape::buildConvex( const Box3F &box, Convex *convex ) bool ConvexShape::buildPolyList( PolyListContext context, AbstractPolyList *plist, const Box3F &box, const SphereF &sphere ) { - if ( mGeometry.points.empty() ) + if ( mGeometry.points.empty() ) return false; // If we're exporting deal with that first.