1
0
Fork 0

Merge branch 'master' of git://gitorious.org/fg/fgdata

This commit is contained in:
Alexis Bory 2010-12-14 21:37:29 +01:00
commit afadec9e0e
2 changed files with 3 additions and 2 deletions

View file

@ -21,6 +21,7 @@
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/random-vegetation</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

View file

@ -147,6 +147,8 @@
</binding> </binding>
</checkbox> </checkbox>
-->
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Random vegetation</label> <label>Random vegetation</label>
@ -156,8 +158,6 @@
</binding> </binding>
</checkbox> </checkbox>
-->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>