summaryrefslogtreecommitdiff
path: root/scene/3d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-06-02 22:08:41 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-06-02 22:08:41 -0300
commit8a1097a2243a9829d5d7e61ef10133f8096aa5e2 (patch)
tree2ec55a650b676975e6ef2ed60e25d68307381269 /scene/3d
parente79d7149ea751e32312cb8625548085d4537c591 (diff)
many fixes to image loader, voxel cone tracing, etc.
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/gi_probe.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp
index 3542b8b876..2acbed3b4e 100644
--- a/scene/3d/gi_probe.cpp
+++ b/scene/3d/gi_probe.cpp
@@ -909,10 +909,11 @@ Vector<Color> GIProbe::_get_bake_texture(Ref<Image> p_image, const Color &p_colo
for (int i = 0; i < bake_texture_size * bake_texture_size; i++) {
Color c;
- c.r = r[i * 4 + 0] / 255.0;
- c.g = r[i * 4 + 1] / 255.0;
- c.b = r[i * 4 + 2] / 255.0;
+ c.r = (r[i * 4 + 0] / 255.0) * p_color.r;
+ c.g = (r[i * 4 + 1] / 255.0) * p_color.g;
+ c.b = (r[i * 4 + 2] / 255.0) * p_color.b;
c.a = r[i * 4 + 3] / 255.0;
+
ret[i] = c;
}