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

Aircraft/c172p/Models/c172p.xml

@@ -14,7 +14,15 @@
      rplayer.getNode("sim/model/door-positions/rightDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[0]")); 
      rplayer.getNode("sim/model/door-positions/leftDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[1]")); 
      rplayer.getNode("sim/model/door-positions/baggageDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[2]")); 
+      
+     var livery_update = aircraft.livery_update.new(
+     "Aircraft/c172p/Models/Liveries", 10,
+     func { print("c172p livery update") });
    </load>
+
+   <unload>
+     livery_update.stop();
+   </unload>
  </nasal> 
 
  <!-- Normal shader effect. Separate effects required for each normal map texture -->
@@ -42,18 +50,6 @@
     <object-name>elevatorright</object-name>
  </effect>
 
-
-  <nasal>
-   <load>
-     var livery_update = aircraft.livery_update.new(
-     "Aircraft/c172p/Models/Liveries", 10,
-     func { print("c172p livery update") });
-   </load>
-
-   <unload>
-     livery_update.stop();
-   </unload>
- </nasal>
 <!-- Immatriculatoin -->
  <model>
    <path>Aircraft/c172p/Models/Immat/immat.xml</path>

Effects/lightmap.eff

@@ -9,7 +9,7 @@
     <material>
       <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
     </material>
-    <condition><use>/sim/rendering/shader/generic</use></condition>
+    <condition><use>/sim/rendering/shaders/generic</use></condition>
     <factor>1</factor>
 		<!-- 		BEGIN fog include -->
 		<visibility>