Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix after soft node overlays 

This removes a segmentation fault and makes node meshes well colorized.
master
Dániel Juhász 2017-04-21 18:04:06 +02:00 committed by sfan5
parent 1ffb180868
commit 900b816162
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_mapblock.cpp
View File

@ -108,7 +108,7 @@ void MapblockMeshGenerator::drawQuad(v3f *coords, const v3s16 &normal)
vertices[j].Pos = coords[j] + origin; vertices[j].Pos = coords[j] + origin;
vertices[j].Normal = normal2; vertices[j].Normal = normal2;
if (data->m_smooth_lighting) if (data->m_smooth_lighting)
vertices[j].Color = blendLight(coords[j]); vertices[j].Color = blendLightColor(coords[j]);
else else
vertices[j].Color = color; vertices[j].Color = color;
if (shade_face) if (shade_face)
@ -298,7 +298,7 @@ video::SColor MapblockMeshGenerator::blendLightColor(const v3f &vertex_pos)
video::SColor MapblockMeshGenerator::blendLightColor(const v3f &vertex_pos, video::SColor MapblockMeshGenerator::blendLightColor(const v3f &vertex_pos,
const v3f &vertex_normal) const v3f &vertex_normal)
{ {
video::SColor color = blendLight(vertex_pos); video::SColor color = blendLightColor(vertex_pos);
if (!f->light_source) if (!f->light_source)
applyFacesShading(color, vertex_normal); applyFacesShading(color, vertex_normal);
return color; return color;

2
src/wieldmesh.cpp
View File

@ -438,7 +438,7 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
g_extrusion_mesh_cache->grab(); g_extrusion_mesh_cache->grab();
} }
scene::SMesh *mesh; scene::SMesh *mesh = NULL;
// If inventory_image is defined, it overrides everything else // If inventory_image is defined, it overrides everything else
if (def.inventory_image != "") { if (def.inventory_image != "") {