[Scummvm-git-logs] scummvm master -> 70f64dd3981a698f348aa0d19f9a7af94efe1dea

[digitall]

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:
70f64dd398 TINYGL: Fix Cut and Paste Error Causing Duplicate Branch


Commit: 70f64dd3981a698f348aa0d19f9a7af94efe1dea
    https://github.com/scummvm/scummvm/commit/70f64dd3981a698f348aa0d19f9a7af94efe1dea
Author: D G Turner (digitall at scummvm.org)
Date: 2021-12-17T00:44:18Z

Commit Message:
TINYGL: Fix Cut and Paste Error Causing Duplicate Branch

This was detected by GCC's -Wduplicated-branches warning which is
not enabled by default.

Changed paths:
    graphics/tinygl/ztriangle.cpp


diff --git a/graphics/tinygl/ztriangle.cpp b/graphics/tinygl/ztriangle.cpp
index ac5a618f25..7fdc6fd451 100644
--- a/graphics/tinygl/ztriangle.cpp
+++ b/graphics/tinygl/ztriangle.cpp
@@ -703,7 +703,7 @@ void FrameBuffer::fillTriangleSmooth(ZBufferPoint *p0, ZBufferPoint *p1, ZBuffer
 	if (_depthWrite && _depthTestEnabled)
 		fillTriangle<interpRGB, interpZ, interpST, interpSTZ, smoothMode, true>(p0, p1, p2);
 	else
-		fillTriangle<interpRGB, interpZ, interpST, interpSTZ, smoothMode, true>(p0, p1, p2);
+		fillTriangle<interpRGB, interpZ, interpST, interpSTZ, smoothMode, false>(p0, p1, p2);
 }
 
 void FrameBuffer::fillTriangleTextureMappingPerspectiveSmooth(ZBufferPoint *p0, ZBufferPoint *p1, ZBufferPoint *p2) {