mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-20 04:34:48 +00:00
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:
commit
75fcc5f2c4
|
|
@ -78,7 +78,6 @@ function RiverEditorGui::createRiver( %this )
|
|||
|
||||
rippleTex = "art/water/ripple.dds";
|
||||
foamTex = "art/water/foam";
|
||||
cubemap = "DefaultSkyCubemap";
|
||||
depthGradientTex = "art/water/depthcolor_ramp";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ function RiverEditorGui::createRiver( %this )
|
|||
|
||||
rippleTex = "art/water/ripple.dds";
|
||||
foamTex = "art/water/foam";
|
||||
cubemap = "DefaultSkyCubemap";
|
||||
depthGradientTex = "art/water/depthcolor_ramp";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue