- exchanged the preprocessor again, no warnings now

- disable line directives for now, causing some trouble

extern/shiny

@@ -1 +1 @@
-Subproject commit 7af50bf4463a828ee0e8cb72c93445c793864bf9
+Subproject commit 34c098c636659b63e0ce85d371f4933c27191753

files/materials/objects.shader

@@ -132,7 +132,7 @@
         shUniform(float4, fogParams) @shAutoConstant(fogParams, fog_params)
 #endif
 
-#ifdef HAS_VERTEXCOLOR
+#if HAS_VERTEXCOLOR
         shInput(float4, colourPassthrough)
 #endif
 

files/materials/terrain.shader

@@ -247,10 +247,7 @@
         // first layer of first pass doesn't need a blend map
         albedo = shSample(diffuseMap0, UV * 10).rgb;
 #else
-        #define BLEND_AMOUNT blendValues@shPropertyString(blendmap_component_@shIterator)
+        albedo = shLerp(albedo, shSample(diffuseMap@shIterator, UV * 10).rgb, blendValues@shPropertyString(blendmap_component_@shIterator));
-        
-        
-        albedo = shLerp(albedo, shSample(diffuseMap@shIterator, UV * 10).rgb, BLEND_AMOUNT);
 
 #endif
 @shEndForeach