Blender Git Loki
Git Commits -> Revision 7aaa7aa
Revision 7aaa7aa by Brecht Van Lommel (master) May 19, 2019, 12:36 (GMT) |
Images: change alpha settings to support channel packing This also replaces the Use Alpha setting. We now have these alpha modes: * Straight: store RGB and alpha channels separately with alpha acting as a mask, also known as unassociated alpha. * Premultiplied: transparent RGB pixels are multiplied by the alpha channel. The natural format for renders. * Channel Packed: different images are packed in the RGB and alpha channels, and they should not influence each other. Channel packing is commonly used by game engines to save memory. * None: ignore alpha channel from the file and make image fully opaque. Cycles OSL does not correctly support Channel Packed and None yet, we are missing fine control over the OpenImageIO texture cache to do that. Fixes T53672 |
Commit Details:
Full Hash: 7aaa7aa9dd79b8c6e37f351fd67a93ba07fbb883
Parent Commit: 3b23b5c
Lines Changed: +200, -100
21 Modified Paths:
/intern/cycles/blender/blender_mesh.cpp (+1, -2) (Diff)
/intern/cycles/blender/blender_shader.cpp (+9, -3) (Diff)
/intern/cycles/render/image.cpp (+16, -14) (Diff)
/intern/cycles/render/image.h (+4, -4) (Diff)
/intern/cycles/render/nodes.cpp (+41, -23) (Diff)
/intern/cycles/render/nodes.h (+2, -2) (Diff)
/intern/cycles/util/util_texture.h (+12, -0) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+16, -8) (Diff)
/source/blender/blenloader/intern/versioning_260.c (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+11, -0) (Diff)
/source/blender/editors/space_image/image_buttons.c (+6, -4) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+3, -0) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+5, -3) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+28, -7) (Diff)
/source/blender/imbuf/intern/divers.c (+14, -3) (Diff)
/source/blender/imbuf/intern/readimage.c (+6, -10) (Diff)
/source/blender/makesdna/DNA_image_types.h (+3, -1) (Diff)
/source/blender/makesrna/intern/rna_image.c (+16, -11) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+2, -1) (Diff)
/source/blender/render/intern/source/imagetexture.c (+3, -3) (Diff)
/intern/cycles/blender/blender_shader.cpp (+9, -3) (Diff)
/intern/cycles/render/image.cpp (+16, -14) (Diff)
/intern/cycles/render/image.h (+4, -4) (Diff)
/intern/cycles/render/nodes.cpp (+41, -23) (Diff)
/intern/cycles/render/nodes.h (+2, -2) (Diff)
/intern/cycles/util/util_texture.h (+12, -0) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+16, -8) (Diff)
/source/blender/blenloader/intern/versioning_260.c (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+11, -0) (Diff)
/source/blender/editors/space_image/image_buttons.c (+6, -4) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+3, -0) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+5, -3) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+28, -7) (Diff)
/source/blender/imbuf/intern/divers.c (+14, -3) (Diff)
/source/blender/imbuf/intern/readimage.c (+6, -10) (Diff)
/source/blender/makesdna/DNA_image_types.h (+3, -1) (Diff)
/source/blender/makesrna/intern/rna_image.c (+16, -11) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+2, -1) (Diff)
/source/blender/render/intern/source/imagetexture.c (+3, -3) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021