From 95640a1b6f2497d60d99808913e1733ef8af1943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Wed, 12 Nov 2014 22:30:15 +0100 Subject: [PATCH] UniformFactory: merge current uniform per of effect --- Effects/agriculture.eff | 1 - Effects/airfield.eff | 1 - Effects/ambient.eff | 1 - Effects/bloom-blur-1.eff | 1 - Effects/bloom-blur-2.eff | 1 - Effects/bloom-combine.eff | 1 - Effects/blur.eff | 1 - Effects/bowwave.eff | 1 - Effects/building.eff | 1 - Effects/bumpspec.eff | 1 - Effects/chrome.eff | 1 - Effects/cloud-impostor.eff | 1 - Effects/cloud-models.eff | 1 - Effects/cloud-noctilucent.eff | 1 - Effects/cloud-static.eff | 49 +++++++++++------------ Effects/cloud.eff | 1 - Effects/clouds-box.eff | 1 - Effects/clouds-layered.eff | 1 - Effects/clouds-thick.eff | 1 - Effects/clouds-thin.eff | 1 - Effects/clouds-thinlayer.eff | 1 - Effects/crop.eff | 1 - Effects/cropgrass.eff | 1 - Effects/dirt-runway.eff | 1 - Effects/display.eff | 1 - Effects/flutter.eff | 1 - Effects/fog.eff | 1 - Effects/forest.eff | 1 - Effects/glacier.eff | 1 - Effects/herbtundra.eff | 1 - Effects/landmass-nowood.eff | 1 - Effects/landmass-scrub.eff | 1 - Effects/landmass.eff | 1 - Effects/lfeat.eff | 1 - Effects/light-cone.eff | 1 - Effects/light-point.eff | 1 - Effects/light-spot.eff | 1 - Effects/lightmap.eff | 1 - Effects/material-diffuse.eff | 1 - Effects/material-off.eff | 1 - Effects/model-combined-deferred.eff | 3 +- Effects/model-combined-transparent.eff | 1 - Effects/model-combined.eff | 1 - Effects/model-default.eff | 1 - Effects/model-transparent.eff | 1 - Effects/planet-cloudlayer.eff | 1 - Effects/planet.eff | 1 - Effects/rain-layer.eff | 17 ++++---- Effects/reflect-bump-spec.eff | 23 +++++------ Effects/reflect.eff | 1 - Effects/rock.eff | 1 - Effects/runway-dds.eff | 1 - Effects/runway.eff | 1 - Effects/skydome.eff | 1 - Effects/ssao-blur-1.eff | 1 - Effects/ssao-blur-2.eff | 1 - Effects/ssao.eff | 1 - Effects/sunlight.eff | 1 - Effects/surface-lights.eff | 1 - Effects/terrain-default.eff | 1 - Effects/test.eff | 1 - Effects/transition-base-dirt.eff | 1 - Effects/transition-base-grass-inverse.eff | 1 - Effects/transition-base-grass-rock.eff | 1 - Effects/transition-base-rock.eff | 1 - Effects/transition.eff | 1 - Effects/tree.eff | 1 - Effects/urban.eff | 1 - Effects/water-dds.eff | 1 - Effects/water-inland.eff | 1 - Effects/water.eff | 1 - 71 files changed, 44 insertions(+), 115 deletions(-) diff --git a/Effects/agriculture.eff b/Effects/agriculture.eff index 2cb59f457..11887a9e5 100644 --- a/Effects/agriculture.eff +++ b/Effects/agriculture.eff @@ -1,6 +1,5 @@ - Effects/agriculture Effects/crop diff --git a/Effects/airfield.eff b/Effects/airfield.eff index 0ac448798..3cebfca0a 100644 --- a/Effects/airfield.eff +++ b/Effects/airfield.eff @@ -1,6 +1,5 @@ - Effects/airfield Effects/terrain-default diff --git a/Effects/ambient.eff b/Effects/ambient.eff index d5bd2ad4a..d2abd7093 100644 --- a/Effects/ambient.eff +++ b/Effects/ambient.eff @@ -1,6 +1,5 @@ - Effects/ambient /sim/rendering/rembrandt/ambient-occlusion /sim/rendering/rembrandt/ambient-occlusion-strength diff --git a/Effects/bloom-blur-1.eff b/Effects/bloom-blur-1.eff index 2e5f259f5..87c9d71be 100644 --- a/Effects/bloom-blur-1.eff +++ b/Effects/bloom-blur-1.eff @@ -1,6 +1,5 @@ - Effects/bloom-blur-1 Effects/blur 4.0 diff --git a/Effects/bloom-blur-2.eff b/Effects/bloom-blur-2.eff index a764658b6..c2c5ad508 100644 --- a/Effects/bloom-blur-2.eff +++ b/Effects/bloom-blur-2.eff @@ -1,6 +1,5 @@ - Effects/bloom-blur-2 Effects/blur 0.0 diff --git a/Effects/bloom-combine.eff b/Effects/bloom-combine.eff index d07a5b242..551c3abec 100644 --- a/Effects/bloom-combine.eff +++ b/Effects/bloom-combine.eff @@ -1,6 +1,5 @@ - Effects/bloom-combine diff --git a/Effects/blur.eff b/Effects/blur.eff index b80ddb095..4ceb1770b 100644 --- a/Effects/blur.eff +++ b/Effects/blur.eff @@ -1,6 +1,5 @@ - Effects/blur 0.0 0.0 diff --git a/Effects/bowwave.eff b/Effects/bowwave.eff index 18e693985..70000000f 100644 --- a/Effects/bowwave.eff +++ b/Effects/bowwave.eff @@ -1,6 +1,5 @@ - Effects/bowwave Effects/model-default diff --git a/Effects/building.eff b/Effects/building.eff index 938f841cf..24bbf0d54 100644 --- a/Effects/building.eff +++ b/Effects/building.eff @@ -1,6 +1,5 @@ - Effects/building Effects/model-combined-deferred diff --git a/Effects/bumpspec.eff b/Effects/bumpspec.eff index 968300b37..d87b8da3c 100644 --- a/Effects/bumpspec.eff +++ b/Effects/bumpspec.eff @@ -28,7 +28,6 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the --> - Effects/bumpspec Effects/model-default 6 diff --git a/Effects/chrome.eff b/Effects/chrome.eff index eaa61e762..9ba1a6776 100644 --- a/Effects/chrome.eff +++ b/Effects/chrome.eff @@ -1,6 +1,5 @@ - Effects/chrome transparent diff --git a/Effects/cloud-impostor.eff b/Effects/cloud-impostor.eff index 13c675304..b7c45b88d 100644 --- a/Effects/cloud-impostor.eff +++ b/Effects/cloud-impostor.eff @@ -1,6 +1,5 @@ - Effects/cloud-impostor diff --git a/Effects/cloud-models.eff b/Effects/cloud-models.eff index 488ca3356..c12991a7b 100644 --- a/Effects/cloud-models.eff +++ b/Effects/cloud-models.eff @@ -1,6 +1,5 @@ - Effects/cloud-models white diff --git a/Effects/cloud-noctilucent.eff b/Effects/cloud-noctilucent.eff index a390c7173..93e83b899 100644 --- a/Effects/cloud-noctilucent.eff +++ b/Effects/cloud-noctilucent.eff @@ -1,6 +1,5 @@ - Effects/cloud-noctilucent diff --git a/Effects/cloud-static.eff b/Effects/cloud-static.eff index ffce59cef..908d9295a 100644 --- a/Effects/cloud-static.eff +++ b/Effects/cloud-static.eff @@ -1,6 +1,5 @@ - Effects/cloud-static @@ -64,25 +63,25 @@ sampler-2d 0 - - terminator - float - terminator + + terminator + float + terminator - - altitude - float - altitude + + altitude + float + altitude - - cloud_self_shading - float - cloud_self_shading + + cloud_self_shading + float + cloud_self_shading - - moonlight - float - moonlight + + moonlight + float + moonlight true @@ -140,15 +139,15 @@ sampler-2d 0 - - terminator - float - terminator + + terminator + float + terminator - - altitude - float - altitude + + altitude + float + altitude true diff --git a/Effects/cloud.eff b/Effects/cloud.eff index 8e2d830e7..9634190f8 100644 --- a/Effects/cloud.eff +++ b/Effects/cloud.eff @@ -1,6 +1,5 @@ - Effects/cloud diff --git a/Effects/clouds-box.eff b/Effects/clouds-box.eff index a7483263e..72dbb3296 100644 --- a/Effects/clouds-box.eff +++ b/Effects/clouds-box.eff @@ -1,6 +1,5 @@ - Effects/clouds-thin diff --git a/Effects/clouds-layered.eff b/Effects/clouds-layered.eff index b638339c7..1a8ee3414 100644 --- a/Effects/clouds-layered.eff +++ b/Effects/clouds-layered.eff @@ -1,6 +1,5 @@ - Effects/clouds-layered diff --git a/Effects/clouds-thick.eff b/Effects/clouds-thick.eff index 7c5beaf7f..adf8e043e 100644 --- a/Effects/clouds-thick.eff +++ b/Effects/clouds-thick.eff @@ -1,6 +1,5 @@ - Effects/clouds-thick diff --git a/Effects/clouds-thin.eff b/Effects/clouds-thin.eff index fae3163a7..13d2f33ca 100644 --- a/Effects/clouds-thin.eff +++ b/Effects/clouds-thin.eff @@ -1,6 +1,5 @@ - Effects/clouds-thin diff --git a/Effects/clouds-thinlayer.eff b/Effects/clouds-thinlayer.eff index 0bf9158df..7b0c5908d 100644 --- a/Effects/clouds-thinlayer.eff +++ b/Effects/clouds-thinlayer.eff @@ -1,6 +1,5 @@ - Effects/clouds-layered diff --git a/Effects/crop.eff b/Effects/crop.eff index 5e7d265fa..2c9d6ccd9 100644 --- a/Effects/crop.eff +++ b/Effects/crop.eff @@ -1,6 +1,5 @@ - Effects/crop Effects/terrain-default diff --git a/Effects/cropgrass.eff b/Effects/cropgrass.eff index 04a904d76..07395477e 100644 --- a/Effects/cropgrass.eff +++ b/Effects/cropgrass.eff @@ -1,6 +1,5 @@ - Effects/cropgrass Effects/crop diff --git a/Effects/dirt-runway.eff b/Effects/dirt-runway.eff index 5638a9bc6..b451f2ca5 100644 --- a/Effects/dirt-runway.eff +++ b/Effects/dirt-runway.eff @@ -1,6 +1,5 @@ - Effects/dirt-runway Effects/runway diff --git a/Effects/display.eff b/Effects/display.eff index 3aaa20cc6..fe1ac236f 100644 --- a/Effects/display.eff +++ b/Effects/display.eff @@ -1,6 +1,5 @@ - Effects/display /sim/rendering/rembrandt/show-buffers /sim/rendering/rembrandt/bloom diff --git a/Effects/flutter.eff b/Effects/flutter.eff index c874d0f91..9b121bd9c 100644 --- a/Effects/flutter.eff +++ b/Effects/flutter.eff @@ -1,6 +1,5 @@ - Effects/flutter Effects/model-default true diff --git a/Effects/fog.eff b/Effects/fog.eff index b35de4b16..28c055613 100644 --- a/Effects/fog.eff +++ b/Effects/fog.eff @@ -1,6 +1,5 @@ - Effects/fog false diff --git a/Effects/forest.eff b/Effects/forest.eff index 1405c9eca..93768a517 100644 --- a/Effects/forest.eff +++ b/Effects/forest.eff @@ -1,6 +1,5 @@ - Effects/forest Effects/terrain-default diff --git a/Effects/glacier.eff b/Effects/glacier.eff index 77baa46c7..6b5b11b2c 100644 --- a/Effects/glacier.eff +++ b/Effects/glacier.eff @@ -1,6 +1,5 @@ - Effects/glacier Effects/terrain-default diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff index 6a13b6f61..d3db665c1 100644 --- a/Effects/herbtundra.eff +++ b/Effects/herbtundra.eff @@ -1,6 +1,5 @@ - Effects/herbtundra Effects/terrain-default diff --git a/Effects/landmass-nowood.eff b/Effects/landmass-nowood.eff index c31473da6..1b9f86711 100644 --- a/Effects/landmass-nowood.eff +++ b/Effects/landmass-nowood.eff @@ -1,6 +1,5 @@ - Effects/landmass-nowood Effects/landmass 0.0 diff --git a/Effects/landmass-scrub.eff b/Effects/landmass-scrub.eff index 60fb9b3ab..539a19c14 100644 --- a/Effects/landmass-scrub.eff +++ b/Effects/landmass-scrub.eff @@ -1,6 +1,5 @@ - Effects/landmass-scrub Effects/landmass diff --git a/Effects/landmass.eff b/Effects/landmass.eff index 3198ff71f..063769453 100644 --- a/Effects/landmass.eff +++ b/Effects/landmass.eff @@ -1,6 +1,5 @@ - Effects/landmass Effects/terrain-default diff --git a/Effects/lfeat.eff b/Effects/lfeat.eff index d97550532..35a004faa 100644 --- a/Effects/lfeat.eff +++ b/Effects/lfeat.eff @@ -1,6 +1,5 @@ - Effects/lfeat Effects/runway diff --git a/Effects/light-cone.eff b/Effects/light-cone.eff index 5fcc3a3db..26e80c771 100644 --- a/Effects/light-cone.eff +++ b/Effects/light-cone.eff @@ -14,7 +14,6 @@ Uses stencil buffer. - Effects/light-cone Effects/model-default diff --git a/Effects/light-point.eff b/Effects/light-point.eff index 3d1f74814..56b4ed74a 100644 --- a/Effects/light-point.eff +++ b/Effects/light-point.eff @@ -1,6 +1,5 @@ - Effects/light-point diff --git a/Effects/light-spot.eff b/Effects/light-spot.eff index 2b8630e52..f64877c3f 100644 --- a/Effects/light-spot.eff +++ b/Effects/light-spot.eff @@ -1,6 +1,5 @@ - Effects/light-spot diff --git a/Effects/lightmap.eff b/Effects/lightmap.eff index e3c8b5f5d..4c7b325a6 100644 --- a/Effects/lightmap.eff +++ b/Effects/lightmap.eff @@ -1,6 +1,5 @@ - Effects/lightmap white diff --git a/Effects/material-diffuse.eff b/Effects/material-diffuse.eff index d99153c5a..b1c253f88 100644 --- a/Effects/material-diffuse.eff +++ b/Effects/material-diffuse.eff @@ -1,6 +1,5 @@ - Effects/material-diffuse 1 diff --git a/Effects/material-off.eff b/Effects/material-off.eff index e6cf9f202..066a09297 100644 --- a/Effects/material-off.eff +++ b/Effects/material-off.eff @@ -1,6 +1,5 @@ - Effects/material-off 0 diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff index deeb6b095..5afc821f9 100644 --- a/Effects/model-combined-deferred.eff +++ b/Effects/model-combined-deferred.eff @@ -6,7 +6,6 @@ For now it only disables the ubershader under Rembrandt for the objects that use it, and replaces it with the default shader. --> - Effects/model-combined-deferred Effects/model-combined @@ -624,4 +623,4 @@ the objects that use it, and replaces it with the default shader. - \ No newline at end of file + diff --git a/Effects/model-combined-transparent.eff b/Effects/model-combined-transparent.eff index 05470e77f..64eafba11 100644 --- a/Effects/model-combined-transparent.eff +++ b/Effects/model-combined-transparent.eff @@ -4,7 +4,6 @@ to provide glass/transparent surfaces with the ubershader active, and fallback to plain transparency when the model shader is disabled. --> - Effects/model-combined-transparent Effects/model-combined diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff index 25da2b7cf..70ac11133 100644 --- a/Effects/model-combined.eff +++ b/Effects/model-combined.eff @@ -3,7 +3,6 @@ please see Docs/README.model-combined.eff for documentation --> - Effects/model-combined Effects/model-default diff --git a/Effects/model-default.eff b/Effects/model-default.eff index ac822605a..5c29714a4 100644 --- a/Effects/model-default.eff +++ b/Effects/model-default.eff @@ -1,6 +1,5 @@ - Effects/model-default diff --git a/Effects/model-transparent.eff b/Effects/model-transparent.eff index dfde84081..e304c9901 100644 --- a/Effects/model-transparent.eff +++ b/Effects/model-transparent.eff @@ -1,6 +1,5 @@ - Effects/model-transparent diff --git a/Effects/planet-cloudlayer.eff b/Effects/planet-cloudlayer.eff index bd0850561..f902a7666 100644 --- a/Effects/planet-cloudlayer.eff +++ b/Effects/planet-cloudlayer.eff @@ -1,6 +1,5 @@ - Effects/planet diff --git a/Effects/planet.eff b/Effects/planet.eff index a17ffcf89..f1515b709 100644 --- a/Effects/planet.eff +++ b/Effects/planet.eff @@ -1,6 +1,5 @@ - Effects/planet diff --git a/Effects/rain-layer.eff b/Effects/rain-layer.eff index e9835076a..513a7bd9c 100644 --- a/Effects/rain-layer.eff +++ b/Effects/rain-layer.eff @@ -1,6 +1,5 @@ - Effects/rain-layer @@ -78,10 +77,10 @@ float scattering - - terminator - float - terminator + + terminator + float + terminator true @@ -149,10 +148,10 @@ float scattering - - terminator - float - terminator + + terminator + float + terminator true diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff index 0ce976f50..269621263 100644 --- a/Effects/reflect-bump-spec.eff +++ b/Effects/reflect-bump-spec.eff @@ -50,7 +50,6 @@ To use your own effect place your efffect file containing something like this: EXAMPLES: You can find examples of both usages in the Hunter and Lightning models. --> - Effects/reflect-bump-spec Effects/model-default @@ -203,9 +202,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model texture[0]/image - - texture[0]/type - + + texture[0]/type + texture[0]/filter @@ -225,9 +224,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model texture[8]/image - - texture[8]/type - + + texture[8]/type + texture[8]/filter @@ -238,7 +237,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model texture[8]/wrap-t - texture[8]/internal-format + texture[8]/internal-format @@ -252,9 +251,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model texture[4]/image - - texture[4]/type - + + texture[4]/type + texture[4]/filter @@ -489,4 +488,4 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model - \ No newline at end of file + diff --git a/Effects/reflect.eff b/Effects/reflect.eff index 1f27b5a05..9fc6a6933 100644 --- a/Effects/reflect.eff +++ b/Effects/reflect.eff @@ -48,7 +48,6 @@ --> - Effects/reflect Effects/model-default diff --git a/Effects/rock.eff b/Effects/rock.eff index f7b77b5b3..e4d221e98 100755 --- a/Effects/rock.eff +++ b/Effects/rock.eff @@ -1,6 +1,5 @@ - Effects/rock Effects/terrain-default diff --git a/Effects/runway-dds.eff b/Effects/runway-dds.eff index e03790eec..966beec7c 100644 --- a/Effects/runway-dds.eff +++ b/Effects/runway-dds.eff @@ -1,6 +1,5 @@ - Effects/runway-dds Effects/runway diff --git a/Effects/runway.eff b/Effects/runway.eff index 5eaa9700b..cf640cd92 100644 --- a/Effects/runway.eff +++ b/Effects/runway.eff @@ -1,6 +1,5 @@ - Effects/runway Effects/terrain-default diff --git a/Effects/skydome.eff b/Effects/skydome.eff index 4d4824113..e893e7ce8 100644 --- a/Effects/skydome.eff +++ b/Effects/skydome.eff @@ -1,6 +1,5 @@ - Effects/skydome /sim/rendering/mie /sim/rendering/rayleigh diff --git a/Effects/ssao-blur-1.eff b/Effects/ssao-blur-1.eff index f5bae695f..0b110dd4b 100644 --- a/Effects/ssao-blur-1.eff +++ b/Effects/ssao-blur-1.eff @@ -1,6 +1,5 @@ - Effects/ssao-blur-1 Effects/blur 4.0 diff --git a/Effects/ssao-blur-2.eff b/Effects/ssao-blur-2.eff index c3b630c06..b80781fe4 100644 --- a/Effects/ssao-blur-2.eff +++ b/Effects/ssao-blur-2.eff @@ -1,6 +1,5 @@ - Effects/ssao-blur-2 Effects/blur 0.0 diff --git a/Effects/ssao.eff b/Effects/ssao.eff index 31b36f44e..fa084355c 100644 --- a/Effects/ssao.eff +++ b/Effects/ssao.eff @@ -1,6 +1,5 @@ - Effects/ssao 1.0 0.0 diff --git a/Effects/sunlight.eff b/Effects/sunlight.eff index 05c917ada..12d5be0f3 100644 --- a/Effects/sunlight.eff +++ b/Effects/sunlight.eff @@ -1,6 +1,5 @@ - Effects/sunlight /sim/rendering/shadows/filtering diff --git a/Effects/surface-lights.eff b/Effects/surface-lights.eff index ea17f3b5c..051562ebf 100644 --- a/Effects/surface-lights.eff +++ b/Effects/surface-lights.eff @@ -1,6 +1,5 @@ - Effects/surface-lights diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff index 7f00ed977..607bffd39 100644 --- a/Effects/terrain-default.eff +++ b/Effects/terrain-default.eff @@ -1,6 +1,5 @@ - Effects/terrain-default diff --git a/Effects/test.eff b/Effects/test.eff index e153a2445..301e00bed 100644 --- a/Effects/test.eff +++ b/Effects/test.eff @@ -1,6 +1,5 @@ - Effects/test diff --git a/Effects/transition-base-dirt.eff b/Effects/transition-base-dirt.eff index ec1b3a8a1..58790bcb3 100644 --- a/Effects/transition-base-dirt.eff +++ b/Effects/transition-base-dirt.eff @@ -1,6 +1,5 @@ - Effects/transition-base-dirt Effects/transition diff --git a/Effects/transition-base-grass-inverse.eff b/Effects/transition-base-grass-inverse.eff index 04b5f0b06..040c84b5e 100644 --- a/Effects/transition-base-grass-inverse.eff +++ b/Effects/transition-base-grass-inverse.eff @@ -1,6 +1,5 @@ - Effects/transition-base-rock Effects/transition diff --git a/Effects/transition-base-grass-rock.eff b/Effects/transition-base-grass-rock.eff index 621b61b8d..4d326a2c0 100644 --- a/Effects/transition-base-grass-rock.eff +++ b/Effects/transition-base-grass-rock.eff @@ -1,6 +1,5 @@ - Effects/transition-base-grass-rock Effects/transition diff --git a/Effects/transition-base-rock.eff b/Effects/transition-base-rock.eff index 1eea01539..c5de9182e 100644 --- a/Effects/transition-base-rock.eff +++ b/Effects/transition-base-rock.eff @@ -1,6 +1,5 @@ - Effects/transition-base-rock Effects/transition diff --git a/Effects/transition.eff b/Effects/transition.eff index b0e1682cd..9933fc8b6 100644 --- a/Effects/transition.eff +++ b/Effects/transition.eff @@ -12,7 +12,6 @@ parameters : --> - Effects/transition Effects/terrain-default diff --git a/Effects/tree.eff b/Effects/tree.eff index 8b5226d06..ec5f9b4a3 100644 --- a/Effects/tree.eff +++ b/Effects/tree.eff @@ -12,7 +12,6 @@ Note: no sorting needed! --> - Effects/tree diff --git a/Effects/urban.eff b/Effects/urban.eff index a542bfb3e..a2bde62f8 100644 --- a/Effects/urban.eff +++ b/Effects/urban.eff @@ -1,6 +1,5 @@ - Effects/urban Effects/terrain-default diff --git a/Effects/water-dds.eff b/Effects/water-dds.eff index e3f09b50d..dfd2ab07f 100644 --- a/Effects/water-dds.eff +++ b/Effects/water-dds.eff @@ -1,6 +1,5 @@ - Effects/water-dds Effects/water diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff index b5003f2fb..c57520339 100644 --- a/Effects/water-inland.eff +++ b/Effects/water-inland.eff @@ -1,6 +1,5 @@ - Effects/water-inland Effects/terrain-default diff --git a/Effects/water.eff b/Effects/water.eff index 6dc1a23b3..6daacbe02 100644 --- a/Effects/water.eff +++ b/Effects/water.eff @@ -1,6 +1,5 @@ - Effects/water Effects/terrain-default