Fix regression in light calculation

sapier · sapier · commit bfaba2c12a9e · 2014-06-30T22:56:08.000+02:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,8 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data)`
`258`	`258`	`{`
`259`	`259`	`MapNode n = data->m_vmanip.getNodeNoEx(p - dirs8[i]);`
`260`	`260`
	`261`	`+ // if it's CONTENT_IGNORE we can't do any light calculations`
`261`	`262`	`if (n.getContent() == CONTENT_IGNORE) {`
`262`		`- ambient_occlusion++;`
`263`	`263`	`continue;`
`264`	`264`	`}`
`265`	`265`
`@@ -273,6 +273,9 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data)`
`273`	`273`	`light += decode_light(n.getLight(bank, ndef));`
`274`	`274`	`light_count++;`
`275`	`275`	`}`
	`276`	`+ else {`
	`277`	`+ ambient_occlusion++;`
	`278`	`+ }`
`276`	`279`	`}`
`277`	`280`
`278`	`281`	`if(light_count == 0)`