teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #407 from OpenMW/master

Browse source 
Add OpenMW commits up to 17 Apr 2018
This commit is contained in:
David Cernat 2018-04-17 15:25:28 +03:00 committed by GitHub
commit 17678ee60f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -143,6 +143,12 @@ namespace MWGui
mItemView->setModel(mSortModel);
mFilterAll->setStateSelected(true);
mFilterWeapon->setStateSelected(false);
mFilterApparel->setStateSelected(false);
mFilterMagic->setStateSelected(false);
mFilterMisc->setStateSelected(false);
mPreview->updatePtr(mPtr);
mPreview->rebuild();
mPreview->update();

4
files/shaders/objects_fragment.glsl
View file

@ -47,9 +47,9 @@ varying float depth;
#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
#if !PER_PIXEL_LIGHTING
varying vec4 lighting;
centroid varying vec4 lighting;
#else
varying vec4 passColor;
centroid varying vec4 passColor;
#endif
varying vec3 passViewPos;
varying vec3 passNormal;

4
files/shaders/objects_vertex.glsl
View file

@ -38,9 +38,9 @@ varying float depth;
#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
#if !PER_PIXEL_LIGHTING
varying vec4 lighting;
centroid varying vec4 lighting;
#else
varying vec4 passColor;
centroid varying vec4 passColor;
#endif
varying vec3 passViewPos;
varying vec3 passNormal;

4
files/shaders/terrain_fragment.glsl
View file

@ -17,9 +17,9 @@ varying float depth;
#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
#if !PER_PIXEL_LIGHTING
varying vec4 lighting;
centroid varying vec4 lighting;
#else
varying vec4 passColor;
centroid varying vec4 passColor;
#endif
varying vec3 passViewPos;
varying vec3 passNormal;

4
files/shaders/terrain_vertex.glsl
View file

@ -6,9 +6,9 @@ varying float depth;
#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
#if !PER_PIXEL_LIGHTING
varying vec4 lighting;
centroid varying vec4 lighting;
#else
varying vec4 passColor;
centroid varying vec4 passColor;
#endif
varying vec3 passViewPos;
varying vec3 passNormal;