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

[aquadran]

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

Summary:
f76136334f WINTERMUTE: Synced with original code. Fixed two bugs.


Commit: f76136334fd87e4755dfc79aae7ee5ba2a831528
    https://github.com/scummvm/scummvm/commit/f76136334fd87e4755dfc79aae7ee5ba2a831528
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-22T13:15:58+02:00

Commit Message:
WINTERMUTE: Synced with original code. Fixed two bugs.

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp
    engines/wintermute/ad/ad_attach_3dx.cpp
    engines/wintermute/base/gfx/base_renderer3d.h


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index ea618c5c017..260865e1c8d 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -432,6 +432,8 @@ bool AdActor3DX::display() {
 		_game->_renderer->_rectList.add(new BaseActiveRect(_game, this, _xmodel, _xmodel->_boundingRect.left, _xmodel->_boundingRect.top, _xmodel->_boundingRect.right - _xmodel->_boundingRect.left, _xmodel->_boundingRect.bottom - _xmodel->_boundingRect.top, true));
 	}
 
+	_game->_renderer3D->invalidateLastTexture();
+
 	displayAttachments(true);
 
 	if (_hasAmbientLightColor) {
diff --git a/engines/wintermute/ad/ad_attach_3dx.cpp b/engines/wintermute/ad/ad_attach_3dx.cpp
index f25a85eceba..4072297ed86 100644
--- a/engines/wintermute/ad/ad_attach_3dx.cpp
+++ b/engines/wintermute/ad/ad_attach_3dx.cpp
@@ -98,6 +98,8 @@ bool AdAttach3DX::displayAttachable(DXMatrix *viewMat, bool registerObjects) {
 		}
 	}
 
+	_game->_renderer3D->invalidateLastTexture();
+
 	return true;
 }
 
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index c04f8d46f55..97994e24957 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -149,6 +149,10 @@ public:
 	bool forcedFlip() override;
 	virtual bool setViewport3D(DXViewport *viewport) = 0;
 
+	void invalidateLastTexture() {
+		_lastTexture = nullptr;
+	}
+
 	void endSaveLoad() override;
 
 	// ScummVM specific methods <--