diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-11-16 08:41:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 08:41:59 -0300 |
| commit | 5fa7cf35b2069480ca4c84fac3c0e4c5b903e75c (patch) | |
| tree | 5c89699f3873d5818be78f684457416a8d6fa7fa /scene/3d/gi_probe.h | |
| parent | 3002130a6d3ab0a00d3e7538283d7f468becd8fa (diff) | |
| parent | 1980a54dbbb50f27b8560167683109c485dcf7c9 (diff) | |
Merge pull request #12960 from tagcup/fix_gi_emission_energy
Fix energy not affecting emissive texture in GI baker.
Diffstat (limited to 'scene/3d/gi_probe.h')
| -rw-r--r-- | scene/3d/gi_probe.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<Color> _get_bake_texture(Ref<Image> p_image, const Color &p_color, bool p_color_add = false); + Vector<Color> _get_bake_texture(Ref<Image> p_image, const Color &p_color_mul, const Color &p_color_add); Baker::MaterialCache _get_material_cache(Ref<Material> 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<Mesh> &p_mesh, Baker *p_baker, const Vector<Ref<Material> > &p_materials, const Ref<Material> &p_override_material); |