From b466346a538268120d34db94bc5b6176c61d4f61 Mon Sep 17 00:00:00 2001
From: Emilian Huminiuc <emilianh@gmail.com>
Date: Fri, 29 Jun 2012 18:53:29 +0300
Subject: [PATCH] make sure crop and landmass based effects turn off under
Rembrandt Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
---
Effects/crop.eff | 4 ++++
Effects/forest.eff | 4 ++++
Effects/glacier.eff | 4 ++++
Effects/herbtundra.eff | 4 ++++
Effects/landmass.eff | 8 ++++++++
5 files changed, 24 insertions(+)
diff --git a/Effects/crop.eff b/Effects/crop.eff
index 70d81313b..0783e70be 100644
--- a/Effects/crop.eff
+++ b/Effects/crop.eff
@@ -22,6 +22,10 @@
<predicate>
<and>
<property>/sim/rendering/shaders/crop</property>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>
diff --git a/Effects/forest.eff b/Effects/forest.eff
index f146be789..ddc37d1ed 100644
--- a/Effects/forest.eff
+++ b/Effects/forest.eff
@@ -70,6 +70,10 @@
<predicate>
<and>
<property>/sim/rendering/shaders/transition</property>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>
diff --git a/Effects/glacier.eff b/Effects/glacier.eff
index 2dde50909..2d50687d7 100644
--- a/Effects/glacier.eff
+++ b/Effects/glacier.eff
@@ -71,6 +71,10 @@
<predicate>
<and>
<property>/sim/rendering/shaders/transition</property>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>
diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff
index d4bb20d0b..fd4c4af67 100644
--- a/Effects/herbtundra.eff
+++ b/Effects/herbtundra.eff
@@ -71,6 +71,10 @@
<predicate>
<and>
<property>/sim/rendering/shaders/transition</property>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>
diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index aaa0d920e..f638b613f 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -53,6 +53,10 @@
<value type="float">4.0</value>
<float-property>/sim/rendering/shaders/landmass</float-property>
</less-equal>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>
@@ -372,6 +376,10 @@
<predicate>
<and>
<property>/sim/rendering/shaders/landmass</property>
+ <equal>
+ <value type="float">0.0</value>
+ <float-property>/sim/rendering/rembrandt/enabled</float-property>
+ </equal>
<or>
<less-equal>
<value type="float">2.0</value>