TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1391 from Azaezel/C4706

Browse source 
warning C4706: assignment within conditional expression
This commit is contained in:
Daniel Buckmaster 2015-08-08 14:04:35 +10:00
commit c0e82d72a2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/forest/forestWindEmitter.cpp
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. // If the camera is close to the sphere, shrink the sphere so it remains visible.
GameConnection* gc = GameConnection::getConnectionToServer(); GameConnection* gc = GameConnection::getConnectionToServer();
GameBase* gb; GameBase *gb = gc ? gc->getCameraObject() : NULL;
if ( gc && (gb = gc->getCameraObject()) ) if (gb)
{ {
F32 camDist = (gb->getPosition() - getPosition()).len(); F32 camDist = (gb->getPosition() - getPosition()).len();
if ( camDist < mWindRadius ) if ( camDist < mWindRadius )