From 126114cfda83d7683c2156e4ce5f3d7bd9d72045 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 10 Aug 2022 15:21:45 +0200 Subject: [PATCH] Fix ORMMaterial3D not being taken into account by static VoxelGI --- scene/3d/voxelizer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scene/3d/voxelizer.cpp b/scene/3d/voxelizer.cpp index 42a2a68e2da..9380d1cf32e 100644 --- a/scene/3d/voxelizer.cpp +++ b/scene/3d/voxelizer.cpp @@ -323,8 +323,8 @@ Vector Voxelizer::_get_bake_texture(Ref p_image, const Color &p_co } Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref p_material) { - //this way of obtaining materials is inaccurate and also does not support some compressed formats very well - Ref mat = p_material; + // This way of obtaining materials is inaccurate and also does not support some compressed formats very well. + Ref mat = p_material; Ref material = mat; //hack for now @@ -335,7 +335,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref p_material MaterialCache mc; if (mat.is_valid()) { - Ref albedo_tex = mat->get_texture(StandardMaterial3D::TEXTURE_ALBEDO); + Ref albedo_tex = mat->get_texture(BaseMaterial3D::TEXTURE_ALBEDO); Ref img_albedo; if (albedo_tex.is_valid()) { @@ -345,7 +345,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref p_material mc.albedo = _get_bake_texture(img_albedo, Color(1, 1, 1), mat->get_albedo()); // no albedo texture, color is additive } - Ref emission_tex = mat->get_texture(StandardMaterial3D::TEXTURE_EMISSION); + Ref emission_tex = mat->get_texture(BaseMaterial3D::TEXTURE_EMISSION); Color emission_col = mat->get_emission(); float emission_energy = mat->get_emission_energy(); @@ -356,7 +356,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref p_material img_emission = emission_tex->get_image(); } - if (mat->get_emission_operator() == StandardMaterial3D::EMISSION_OP_ADD) { + if (mat->get_emission_operator() == BaseMaterial3D::EMISSION_OP_ADD) { mc.emission = _get_bake_texture(img_emission, Color(1, 1, 1) * emission_energy, emission_col * emission_energy); } else { mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0));