diff options
| author | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
|---|---|---|
| committer | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
| commit | d8c05502272990173381bfd2590884bbc95aa5f5 (patch) | |
| tree | 8bd65efacbe6484b838d4550597d0f4a54ddddd9 /source/blender/blenkernel/intern/texture.c | |
| parent | b64d551f3b2fa409b4eeefb641fc581eb6cd0bd6 (diff) | |
| parent | fe1816f67fbc6aaf383ec77847d668367335d093 (diff) | |
Merge branch 'master' into KTX_supportKTX_support
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index ee9247e6e60..c37e2fb6144 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -67,6 +67,8 @@ #include "BKE_scene.h" #include "BKE_texture.h" +#include "NOD_texture.h" + #include "RE_texture.h" #include "BLO_read_write.h" @@ -721,10 +723,10 @@ void BKE_texture_get_value_ex(const Scene *scene, * if the texture didn't give an RGB value, copy the intensity across */ if (result_type & TEX_RGB) { - texres->tin = (1.0f / 3.0f) * (texres->tr + texres->tg + texres->tb); + texres->tin = (1.0f / 3.0f) * (texres->trgba[0] + texres->trgba[1] + texres->trgba[2]); } else { - copy_v3_fl(&texres->tr, texres->tin); + copy_v3_fl(texres->trgba, texres->tin); } } |