TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-10 22:24:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into defineconsolemethod

Browse source 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-26 13:22:16 +11:00
commit ae284a89ec
129 changed files with 3742 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/environment/waterObject.cpp
View file

@ -891,6 +891,10 @@ void WaterObject::onRemove()
{
mPlaneReflector.unregisterReflector();
cleanupMaterials();
PostEffect *underWaterEffect = getUnderwaterEffect( );
if( underWaterEffect )
underWaterEffect->disable( );
}
Parent::onRemove();