From 6bfcf2bc1b84e888e11742c33547e001e5835036 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 22 Jul 2012 02:45:39 +0200 Subject: [PATCH] - exchanged the preprocessor again, no warnings now - disable line directives for now, causing some trouble --- extern/shiny | 2 +- files/materials/objects.shader | 2 +- files/materials/terrain.shader | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/extern/shiny b/extern/shiny index 7af50bf446..34c098c636 160000 --- a/extern/shiny +++ b/extern/shiny @@ -1 +1 @@ -Subproject commit 7af50bf4463a828ee0e8cb72c93445c793864bf9 +Subproject commit 34c098c636659b63e0ce85d371f4933c27191753 diff --git a/files/materials/objects.shader b/files/materials/objects.shader index eafce7af67..39c9b42e04 100644 --- a/files/materials/objects.shader +++ b/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 diff --git a/files/materials/terrain.shader b/files/materials/terrain.shader index 24771ca412..e0187959f8 100644 --- a/files/materials/terrain.shader +++ b/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, BLEND_AMOUNT); + albedo = shLerp(albedo, shSample(diffuseMap@shIterator, UV * 10).rgb, blendValues@shPropertyString(blendmap_component_@shIterator)); #endif @shEndForeach