From 1980a54dbbb50f27b8560167683109c485dcf7c9 Mon Sep 17 00:00:00 2001 From: Ferenc Arn Date: Wed, 15 Nov 2017 19:01:02 -0500 Subject: Fix energy not affecting emissive texture in GI baker. Also fix emission_tex being invalid always due to wrong reference type. Fixes #10534. --- scene/3d/gi_probe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene/3d/gi_probe.h') diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index 8aca2c549b..8f13960b67 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -178,7 +178,7 @@ private: int color_scan_cell_width; int bake_texture_size; - Vector _get_bake_texture(Ref p_image, const Color &p_color, bool p_color_add = false); + Vector _get_bake_texture(Ref p_image, const Color &p_color_mul, const Color &p_color_add); Baker::MaterialCache _get_material_cache(Ref p_material, Baker *p_baker); void _plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector2 *p_uv, const Baker::MaterialCache &p_material, const Rect3 &p_aabb, Baker *p_baker); void _plot_mesh(const Transform &p_xform, Ref &p_mesh, Baker *p_baker, const Vector > &p_materials, const Ref &p_override_material); -- cgit v1.2.3