Blender Git Loki
Git Commits -> Revision 6673c76
Revision 6673c76 by Bastien Montagne (master) November 20, 2011, 16:38 (GMT) |
Muting node patch: second part. Also fix [#27636] Muting shading nodes is ignored Now, compositing, shading and texture nodes have a consistent muting system, with default behaving as previous (for compo), and which can be optionaly customized by each node. Shader nodes are also GLSL muted. However, Cycles is currently unaware of muted nodes, will try to address this�?� |
Commit Details:
Full Hash: 6673c76e78742c64ccd0afa7a9d1f598a8022878
SVN Revision: 42019
Parent Commit: bbf8315
Lines Changed: +687, -306
31 Modified Paths:
/source/blender/blenkernel/BKE_node.h (+37, -4) (Diff)
/source/blender/blenkernel/intern/node.c (+26, -3) (Diff)
/source/blender/editors/space_node/node_draw.c (+27, -22) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -1) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+27, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+20, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+233, -225) (Diff)
/source/blender/gpu/SConscript (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_composite.c (+2, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_splitViewer.c (+2, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_viewer.c (+2, -0) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+7, -8) (Diff)
/source/blender/nodes/composite/node_composite_util.c (+20, -35) (Diff)
/source/blender/nodes/composite/node_composite_util.h (+1, -1) (Diff)
/source/blender/nodes/intern/node_exec.c (+14, -2) (Diff)
/source/blender/nodes/intern/node_util.c (+61, -0) (Diff)
/source/blender/nodes/intern/node_util.h (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_material.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_world.c (+4, -0) (Diff)
/source/blender/nodes/shader/node_shader_tree.c (+5, -1) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+61, -2) (Diff)
/source/blender/nodes/shader/node_shader_util.h (+3, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_output.c (+3, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_viewer.c (+3, -0) (Diff)
/source/blender/nodes/texture/node_texture_tree.c (+5, -1) (Diff)
/source/blender/nodes/texture/node_texture_util.c (+92, -0) (Diff)
/source/blender/nodes/texture/node_texture_util.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+26, -3) (Diff)
/source/blender/editors/space_node/node_draw.c (+27, -22) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -1) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+27, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+20, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+233, -225) (Diff)
/source/blender/gpu/SConscript (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_composite.c (+2, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_splitViewer.c (+2, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_viewer.c (+2, -0) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+7, -8) (Diff)
/source/blender/nodes/composite/node_composite_util.c (+20, -35) (Diff)
/source/blender/nodes/composite/node_composite_util.h (+1, -1) (Diff)
/source/blender/nodes/intern/node_exec.c (+14, -2) (Diff)
/source/blender/nodes/intern/node_util.c (+61, -0) (Diff)
/source/blender/nodes/intern/node_util.h (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_material.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_world.c (+4, -0) (Diff)
/source/blender/nodes/shader/node_shader_tree.c (+5, -1) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+61, -2) (Diff)
/source/blender/nodes/shader/node_shader_util.h (+3, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_output.c (+3, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_viewer.c (+3, -0) (Diff)
/source/blender/nodes/texture/node_texture_tree.c (+5, -1) (Diff)
/source/blender/nodes/texture/node_texture_util.c (+92, -0) (Diff)
/source/blender/nodes/texture/node_texture_util.h (+2, -0) (Diff)