From: sapier <Sapier at GMX dot net>
Date: Mon, 30 Jun 2014 20:56:08 +0000 (+0200)
Subject: Fix regression in light calculation
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=bfaba2c12a9eb00a602c12f9724c8701842cc385;p=zefram%2Fminetest%2Fminetest_engine.git

Fix regression in light calculation
---

diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index bcc4cba5..21d431cd 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -258,8 +258,8 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data)
 	{
 		MapNode n = data->m_vmanip.getNodeNoEx(p - dirs8[i]);
 
+		// if it's CONTENT_IGNORE we can't do any light calculations
 		if (n.getContent() == CONTENT_IGNORE) {
-			ambient_occlusion++;
 			continue;
 		}
 
@@ -273,6 +273,9 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data)
 			light += decode_light(n.getLight(bank, ndef));
 			light_count++;
 		}
+		else {
+			ambient_occlusion++;
+		}
 	}
 
 	if(light_count == 0)