[Scummvm-git-logs] scummvm master -> 2559b4be9c0bb1889cb7a2bd8ff93f03fbac6ee8

aquadran noreply at scummvm.org
Thu Sep 1 16:51:41 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2559b4be9c WINTERMUTE: Restore accidentally renamed shader files


Commit: 2559b4be9c0bb1889cb7a2bd8ff93f03fbac6ee8
    https://github.com/scummvm/scummvm/commit/2559b4be9c0bb1889cb7a2bd8ff93f03fbac6ee8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-09-01T18:51:33+02:00

Commit Message:
WINTERMUTE: Restore accidentally renamed shader files

Changed paths:
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp


diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index 5e7c0067500..19fc96f7a21 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -520,7 +520,7 @@ bool BaseRenderOpenGL3DShader::initRenderer(int width, int height, bool windowed
 	_transformStack.back().setToIdentity();
 
 	static const char *XModelAttributes[] = {"position", "texcoord", "normal", nullptr};
-	_xmodelShader = OpenGL::Shader::fromFiles("wme_XModel", XModelAttributes);
+	_xmodelShader = OpenGL::Shader::fromFiles("wme_modelx", XModelAttributes);
 
 	setDefaultAmbientLightColor();
 
@@ -568,7 +568,7 @@ bool BaseRenderOpenGL3DShader::initRenderer(int width, int height, bool windowed
 	_lineShader->enableVertexAttribute("position", _lineVBO, 2, GL_FLOAT, false, 8, 0);
 
 	static const char *flatShadowXModelAttributes[] = { "position", nullptr };
-	_flatShadowXModelShader = OpenGL::Shader::fromFiles("wme_flat_shadow_XModel", flatShadowXModelAttributes);
+	_flatShadowXModelShader = OpenGL::Shader::fromFiles("wme_flat_shadow_modelx", flatShadowXModelAttributes);
 
 	_active = true;
 	// setup a proper state




More information about the Scummvm-git-logs mailing list