diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 13:37:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 14:59:29 +0300 |
| commit | 5cb2861420c733a3fa2d73593d820d9bddc7fd85 (patch) | |
| tree | a2286509b5de42106ef52c796cfa3d76569b90e5 /intern/cycles/kernel | |
| parent | 68c0d77b0c95a0fca89ca010f9666c4fc3eb9598 (diff) | |
Fix Cycles incorrect result when compressing some 8 bit log colorspace images
Don't clamp and do premultiply after color space conversion.
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 90f1a7845c7..63939a049a5 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -30,10 +30,6 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, if ((flags & NODE_IMAGE_ALPHA_UNASSOCIATE) && alpha != 1.0f && alpha != 0.0f) { r /= alpha; - const int texture_type = kernel_tex_type(id); - if (texture_type == IMAGE_DATA_TYPE_BYTE4 || texture_type == IMAGE_DATA_TYPE_BYTE) { - r = min(r, make_float4(1.0f, 1.0f, 1.0f, 1.0f)); - } r.w = alpha; } |