Merge remote-tracking branch 'origin/development'

This commit is contained in:
DavidWyand-GG 2013-05-08 19:02:20 -04:00
commit 96746453ce
2 changed files with 2 additions and 2 deletions

View file

@ -52,7 +52,7 @@ singleton ShaderData( PFX_CausticsShader )
singleton PostEffect( CausticsPFX )
{
requirements = "None";
isEnabled = true;
isEnabled = false;
renderTime = "PFXBeforeBin";
renderBin = "ObjTranslucentBin";
//renderPriority = 0.1;

View file

@ -51,7 +51,7 @@ singleton ShaderData( PFX_CausticsShader )
singleton PostEffect( CausticsPFX )
{
requirements = "None";
isEnabled = true;
isEnabled = false;
renderTime = "PFXBeforeBin";
renderBin = "ObjTranslucentBin";
//renderPriority = 0.1;