Merge branch 'master' of D:\Git_New\fgdata

Materials/regions/materials.xml

@@ -837,7 +837,7 @@
 </material>
 
 
-<!-- Europe style city, currently without effects or placement mask -->
+<!-- Europe style city, currently without effects -->
 
 <material>
   <condition>
@@ -865,6 +865,7 @@
   <name>BuiltUpCover</name>
   <name>Urban</name>
   <texture>Terrain/18th_century_city.png</texture>
+  <object-mask>Terrain/18th_century_city.mask.png</object-mask>
   <xsize>1000</xsize>
   <ysize>1000</ysize>
   <light-coverage>100000.0</light-coverage>
@@ -884,11 +885,11 @@
   <building-medium-ratio>0.6</building-medium-ratio>
   <building-large-ratio>0.2</building-large-ratio>
   <wood-coverage>250000.0</wood-coverage>
-  <tree-texture>Trees/mixed-summer.png</tree-texture>
+  <tree-texture>Trees/deciduous-summer.png</tree-texture>
   <tree-varieties>8</tree-varieties>
   <tree-range-m alias="/params/forest/tree-range-m"/>
-  <tree-height-m>25.0</tree-height-m>
-  <tree-width-m>15.0</tree-width-m>
+  <tree-height-m>15.0</tree-height-m>
+  <tree-width-m>10.0</tree-width-m>
 </material>
 
 <!-- default US style city -->
@@ -1011,11 +1012,11 @@
   <building-large-ratio>0.0</building-large-ratio>
   <building-medium-max-floors>4</building-medium-max-floors>
   <wood-coverage>1000.0</wood-coverage>
-  <tree-texture>Trees/mixed-summer.png</tree-texture>
+  <tree-texture>Trees/deciduous-summer.png</tree-texture>
   <tree-varieties>8</tree-varieties>
   <tree-range-m alias="/params/forest/tree-range-m"/>
-  <tree-height-m>25.0</tree-height-m>
-  <tree-width-m>15.0</tree-width-m>
+  <tree-height-m>15.0</tree-height-m>
+  <tree-width-m>10.0</tree-width-m>
 </material>
 
 <!-- default town US style -->
@@ -1458,7 +1459,7 @@
   <name>Vineyard</name>
   <name>Rice</name>
   <texture>Terrain/rice1.png</texture>
-
+  <object-mask>Terrain/rice1.mask.png</object-mask>
   <xsize>2000</xsize>
   <ysize>2000</ysize>
   <light-coverage>2000000.0</light-coverage>