Fixed accessing a null MeshInstance object in BakedLightmap instead of the GeometryInstance

This commit is contained in:
Mack 2022-01-24 06:59:48 +00:00
parent f2ec36fbcd
commit 36c7110c1b

View file

@ -389,7 +389,7 @@ void BakedLightmap::_find_meshes_and_lights(Node *p_at_node, Vector<MeshesFound>
GeometryInstance *gi = Object::cast_to<GeometryInstance>(p_at_node); GeometryInstance *gi = Object::cast_to<GeometryInstance>(p_at_node);
if (gi) { if (gi) {
all_override = mi->get_material_override(); all_override = gi->get_material_override();
} }
for (int i = 0; i < bmeshes.size(); i += 2) { for (int i = 0; i < bmeshes.size(); i += 2) {
@ -414,8 +414,8 @@ void BakedLightmap::_find_meshes_and_lights(Node *p_at_node, Vector<MeshesFound>
mf.mesh = mesh; mf.mesh = mesh;
if (gi) { if (gi) {
mf.cast_shadows = mi->get_cast_shadows_setting() != GeometryInstance::SHADOW_CASTING_SETTING_OFF; mf.cast_shadows = gi->get_cast_shadows_setting() != GeometryInstance::SHADOW_CASTING_SETTING_OFF;
mf.generate_lightmap = mi->get_generate_lightmap(); mf.generate_lightmap = gi->get_generate_lightmap();
} else { } else {
mf.cast_shadows = true; mf.cast_shadows = true;
mf.generate_lightmap = true; mf.generate_lightmap = true;