Blender Git Loki
Git Commits -> Revision 4ef8e14
Revision 4ef8e14 by Jeroen Bakker (compositor-cryptomatte-workflow, temp-compositor-cryptomatte-picker) February 16, 2021, 08:46 (GMT) |
Compositor: Redesign Cryptomatte node for better usability In the current implementation, cryptomatte passes are connected to the node and elements are picked by using the eyedropper tool on a special pick channel. This design has two disadvantages - both connecting all passes individually and always having to switch to the picker channel are tedious. With the new design, the user selects the RenderLayer or Image from which the Cryptomatte layers are directly loaded (the type of pass is determined by an enum). This allows the node to automatically detect all relevant passes. Then, when using the eyedropper tool, the operator looks up the selected coordinates from the picked Image, Node backdrop or Clip and reads the picked object directly from the Renderlayer/Image, therefore allowing to pick in any context (e.g. by clicking on the Combined pass in the Image Viewer). Technically there is some loss of flexibility because the Cryptomatte pass inputs can no longer be connected to other nodes, but since any compositing done on them is likely to break the Cryptomatte system anyways, this isn't really a concern in practise. In the future, this would also allow to automatically translate values to names by looking up the value in the associated metadata of the input, or to get a better visualization of overlapping areas in the Pick output since we could blend colors now that the output doesn't have to contain the exact value. {F9502764} Differential Revision: https://developer.blender.org/D3959 |
Commit Details:
Full Hash: 4ef8e143dd2d84e3d0bf04dfcc8f8629ec7bbf88
Parent Commit: 36814dd
Lines Changed: +682, -221
35 Modified Paths:
/source/blender/blenkernel/BKE_cryptomatte.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+11, -4) (Diff)
/source/blender/blenkernel/intern/cryptomatte.cc (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.cc (+17, -5) (Diff)
/source/blender/blenkernel/intern/scene.c (+3, -2) (Diff)
/source/blender/blenloader/intern/versioning_290.c (+25, -0) (Diff)
/source/blender/compositor/nodes/COM_CryptomatteNode.cpp (+112, -11) (Diff)
/source/blender/draw/engines/eevee/eevee_cryptomatte.c (+17, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_engine.c (+2, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_private.h (+3, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_render.c (+5, -3) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.h (+1, -0) (Diff)
/source/blender/draw/engines/gpencil/gpencil_render.c (+1, -0) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+1, -0) (Diff)
/source/blender/draw/engines/workbench/workbench_render.c (+5, -1) (Diff)
/source/blender/draw/intern/draw_manager.c (+5, -3) (Diff)
/source/blender/draw/intern/DRW_render.h (+1, -0) (Diff)
/source/blender/editors/include/ED_clip.h (+4, -0) (Diff)
/source/blender/editors/include/ED_image.h (+4, -0) (Diff)
/source/blender/editors/include/ED_node.h (+5, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -1) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/interface/interface_eyedropper_color.c (+141, -11) (Diff)
/source/blender/editors/interface/interface_templates.c (+2, -6) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+18, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+17, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+31, -14) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -91) (Diff)
/source/blender/editors/space_node/node_intern.h (+0, -3) (Diff)
/source/blender/editors/space_node/node_ops.c (+0, -3) (Diff)
/source/blender/editors/space_node/node_view.c (+25, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+10, -4) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+145, -11) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c (+60, -43) (Diff)
/source/blender/blenkernel/BKE_node.h (+11, -4) (Diff)
/source/blender/blenkernel/intern/cryptomatte.cc (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.cc (+17, -5) (Diff)
/source/blender/blenkernel/intern/scene.c (+3, -2) (Diff)
/source/blender/blenloader/intern/versioning_290.c (+25, -0) (Diff)
/source/blender/compositor/nodes/COM_CryptomatteNode.cpp (+112, -11) (Diff)
/source/blender/draw/engines/eevee/eevee_cryptomatte.c (+17, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_engine.c (+2, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_private.h (+3, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_render.c (+5, -3) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.h (+1, -0) (Diff)
/source/blender/draw/engines/gpencil/gpencil_render.c (+1, -0) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+1, -0) (Diff)
/source/blender/draw/engines/workbench/workbench_render.c (+5, -1) (Diff)
/source/blender/draw/intern/draw_manager.c (+5, -3) (Diff)
/source/blender/draw/intern/DRW_render.h (+1, -0) (Diff)
/source/blender/editors/include/ED_clip.h (+4, -0) (Diff)
/source/blender/editors/include/ED_image.h (+4, -0) (Diff)
/source/blender/editors/include/ED_node.h (+5, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -1) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/interface/interface_eyedropper_color.c (+141, -11) (Diff)
/source/blender/editors/interface/interface_templates.c (+2, -6) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+18, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+17, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+31, -14) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -91) (Diff)
/source/blender/editors/space_node/node_intern.h (+0, -3) (Diff)
/source/blender/editors/space_node/node_ops.c (+0, -3) (Diff)
/source/blender/editors/space_node/node_view.c (+25, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+10, -4) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+145, -11) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c (+60, -43) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021