mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

- exchanged the preprocessor again, no warnings now

Browse Source 
- disable line directives for now, causing some trouble
This commit is contained in:
scrawl 2012-07-22 02:45:39 +02:00
parent e7ab3544ac
commit 6bfcf2bc1b
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/shiny vendored

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

2
files/materials/objects.shader
View File

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

5
files/materials/terrain.shader
View File

@ -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