From: Dániel Juhász <juhdanad@gmail.com>
Date: Fri, 21 Apr 2017 16:04:06 +0000 (+0200)
Subject: Fix after soft node overlays
X-Git-Tag: 0.4.16~218
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=900b816162401a6d9006334e2e8e8a9a26a1613b;p=oweals%2Fminetest.git

Fix after soft node overlays

This removes a segmentation fault and makes node meshes well colorized.
---

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 9f4223bac..6673e2bd9 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -108,7 +108,7 @@ void MapblockMeshGenerator::drawQuad(v3f *coords, const v3s16 &normal)
 		vertices[j].Pos = coords[j] + origin;
 		vertices[j].Normal = normal2;
 		if (data->m_smooth_lighting)
-			vertices[j].Color = blendLight(coords[j]);
+			vertices[j].Color = blendLightColor(coords[j]);
 		else
 			vertices[j].Color = color;
 		if (shade_face)
@@ -298,7 +298,7 @@ video::SColor MapblockMeshGenerator::blendLightColor(const v3f &vertex_pos)
 video::SColor MapblockMeshGenerator::blendLightColor(const v3f &vertex_pos,
 	const v3f &vertex_normal)
 {
-	video::SColor color = blendLight(vertex_pos);
+	video::SColor color = blendLightColor(vertex_pos);
 	if (!f->light_source)
 		applyFacesShading(color, vertex_normal);
 	return color;
diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp
index 2b23d9e02..8b1477bb7 100644
--- a/src/wieldmesh.cpp
+++ b/src/wieldmesh.cpp
@@ -438,7 +438,7 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 		g_extrusion_mesh_cache->grab();
 	}
 
-	scene::SMesh *mesh;
+	scene::SMesh *mesh = NULL;
 
 	// If inventory_image is defined, it overrides everything else
 	if (def.inventory_image != "") {