From: sfan5 <sfan5@live.de>
Date: Sun, 24 May 2020 09:48:51 +0000 (+0200)
Subject: Fix two bugs in content_cao
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f51cf7c68af16d0068b91d00ab2cc9abdf2b31d0;p=oweals%2Fminetest.git

Fix two bugs in content_cao

fixes #9889 (backface_culling with visual = "cube")
fixes #9916 (crash with visual = "upright_sprite")
---

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 867bbf2c8..cdc12f041 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -713,6 +713,8 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 		mesh->drop();
 
 		m_meshnode->setScale(m_prop.visual_size);
+		m_meshnode->setMaterialFlag(video::EMF_BACK_FACE_CULLING,
+			m_prop.backface_culling);
 
 		setSceneNodeMaterial(m_meshnode);
 	} else if (m_prop.visual == "mesh") {
@@ -832,19 +834,20 @@ void GenericCAO::setNodeLight(u8 light)
 	}
 
 	if (m_enable_shaders) {
-		scene::ISceneNode *node = getSceneNode();
-
-		if (node == nullptr)
-			return;
-
 		if (m_prop.visual == "upright_sprite") {
+			if (!m_meshnode)
+				return;
+
 			scene::IMesh *mesh = m_meshnode->getMesh();
 			for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
 				scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
-				video::SMaterial &material = buf->getMaterial();
-				material.EmissiveColor = color;
+				buf->getMaterial().EmissiveColor = color;
 			}
 		} else {
+			scene::ISceneNode *node = getSceneNode();
+			if (!node)
+				return;
+
 			for (u32 i = 0; i < node->getMaterialCount(); ++i) {
 				video::SMaterial &material = node->getMaterial(i);
 				material.EmissiveColor = color;