From cc58f7e32ede12edda71be2fe7c2c33ccded44d2 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Thu, 24 Nov 2011 22:30:36 +0000
Subject: [PATCH] Remove reliance of 3d clouds on /sim/rendering/shader-effects

---
 Effects/cloud.eff         |  1 -
 gui/dialogs/rendering.xml | 33 ++++++---------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/Effects/cloud.eff b/Effects/cloud.eff
index 93f2c3747..e25f5f4b4 100644
--- a/Effects/cloud.eff
+++ b/Effects/cloud.eff
@@ -11,7 +11,6 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index d9ad756ca..49c59d298 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -247,9 +247,6 @@
 				<halign>left</halign>
 				<label>3D clouds</label>
 				<name>3d-clouds</name>
-				<enable>
-					<property>/sim/rendering/shader-effects</property>
-				</enable>
 				<property>/sim/rendering/clouds3d-enable</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -263,19 +260,13 @@
 				<text>
 					<label>Cloud density</label>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 				</text>
 				<slider>
 					<name>cloud-density</name>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 					<min>0</min>
 					<max>1.0</max>
@@ -295,10 +286,7 @@
 				</slider>
 				<text>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 					<label>12345678</label>
 					<format>%.2f</format>
@@ -313,19 +301,13 @@
 				<text>
 					<label>Cloud visibility range</label>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 				</text>
 				<slider>
 					<name>cloud-vis-range</name>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 					<min>1000.0</min>
 					<max>45000.0</max>
@@ -337,10 +319,7 @@
 				</slider>
 				<text>
 					<enable>
-						<and>
-							<property>/sim/rendering/shader-effects</property>
-							<property>/sim/rendering/clouds3d-enable</property>
-						</and>
+						<property>/sim/rendering/clouds3d-enable</property>
 					</enable>
 					<label>12345678</label>
 					<format>%.fm</format>