Merge pull request #346 from thecelloman/nodefaultcubemaponriver

Default to an empty field for cubemap in the river and other water objec...
This commit is contained in:
SilentMike 2013-04-17 20:20:20 -07:00
commit 75fcc5f2c4
4 changed files with 0 additions and 4 deletions

View file

@ -78,7 +78,6 @@ function RiverEditorGui::createRiver( %this )
rippleTex = "art/water/ripple.dds";
foamTex = "art/water/foam";
cubemap = "DefaultSkyCubemap";
depthGradientTex = "art/water/depthcolor_ramp";
};

View file

@ -800,7 +800,6 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
%this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
%this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
%this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
%this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
}
function ObjectBuilderGui::buildWaterBlock(%this)

View file

@ -78,7 +78,6 @@ function RiverEditorGui::createRiver( %this )
rippleTex = "art/water/ripple.dds";
foamTex = "art/water/foam";
cubemap = "DefaultSkyCubemap";
depthGradientTex = "art/water/depthcolor_ramp";
};

View file

@ -800,7 +800,6 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
%this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
%this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
%this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
%this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
}
function ObjectBuilderGui::buildWaterBlock(%this)