[Scummvm-git-logs] scummvm master -> c3a73efa8df65e6bcbf37e5dc2cd5606dc09778a

[aquadran]

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:
c3a73efa8d TINYGL: No need to check for current_texture


Commit: c3a73efa8df65e6bcbf37e5dc2cd5606dc09778a
    https://github.com/scummvm/scummvm/commit/c3a73efa8df65e6bcbf37e5dc2cd5606dc09778a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-01-01T17:38:48+01:00

Commit Message:
TINYGL: No need to check for current_texture

Changed paths:
    graphics/tinygl/zdirtyrect.cpp


diff --git a/graphics/tinygl/zdirtyrect.cpp b/graphics/tinygl/zdirtyrect.cpp
index fcf2f32f95b..4dea70e3cc5 100644
--- a/graphics/tinygl/zdirtyrect.cpp
+++ b/graphics/tinygl/zdirtyrect.cpp
@@ -473,10 +473,7 @@ RasterizationDrawCall::RasterizationState RasterizationDrawCall::captureState()
 	state.wrapS = c->texture_wrap_s;
 	state.wrapT = c->texture_wrap_t;
 	state.lightingEnabled = c->lighting_enabled;
-	if (c->current_texture != nullptr)
-		state.textureVersion = c->current_texture->versionNumber;
-	else
-		state.textureVersion = 0;
+	state.textureVersion = c->current_texture->versionNumber;
 
 	memcpy(state.viewportScaling, c->viewport.scale._v, sizeof(c->viewport.scale._v));
 	memcpy(state.viewportTranslation, c->viewport.trans._v, sizeof(c->viewport.trans._v));