[Scummvm-git-logs] scummvm master -> 5983c479ce3d1f96a881efda6882feb875bf0ab8

[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:
5983c479ce WINTERMUTE: Small sync in ad_scene


Commit: 5983c479ce3d1f96a881efda6882feb875bf0ab8
    https://github.com/scummvm/scummvm/commit/5983c479ce3d1f96a881efda6882feb875bf0ab8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-24T04:26:52+02:00

Commit Message:
WINTERMUTE: Small sync in ad_scene

Changed paths:
    engines/wintermute/ad/ad_scene.cpp


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 9178d204de2..e1c396ac8e8 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1495,9 +1495,11 @@ bool AdScene::displayRegionContentOld(AdRegion *region) {
 #ifndef ENABLE_WME3D
 			_gameRef->_renderer->setup2D();
 #else
-			Camera3D *activeCamera = _geom->getActiveCamera();
-			if (activeCamera != nullptr) {
-				_gameRef->_renderer->setup3D(activeCamera);
+			if (obj->_is3D && _geom) {
+				Camera3D *activeCamera = _geom->getActiveCamera();
+				if (activeCamera != nullptr) {
+					_gameRef->_renderer->setup3D(activeCamera);
+				}
 			} else {
 				_gameRef->_renderer->setup2D();
 			}