Merge pull request #1391 from Azaezel/C4706

warning C4706: assignment within conditional expression
This commit is contained in:
Daniel Buckmaster 2015-08-08 14:04:35 +10:00
commit c0e82d72a2

View file

@ -521,8 +521,8 @@ void ForestWindEmitter::_renderEmitterInfo( ObjectRenderInst *ri, SceneRenderSta
{
// If the camera is close to the sphere, shrink the sphere so it remains visible.
GameConnection* gc = GameConnection::getConnectionToServer();
GameBase* gb;
if ( gc && (gb = gc->getCameraObject()) )
GameBase *gb = gc ? gc->getCameraObject() : NULL;
if (gb)
{
F32 camDist = (gb->getPosition() - getPosition()).len();
if ( camDist < mWindRadius )