Blender Git Commit Log
Git Commits -> Revision 8d35213
Revision 8d35213 by Ton Roosendaal (master) December 29, 2005, 18:08 (GMT) |
More node goodies! First note; this is a WIP project, some commits might change things that make formerly saved situations not to work identically... like now! ------ New Material integration ------ Until now, the Node system worked on top of the 'current' Material, just like how the Material Layers worked. That's quite confusing in practice, especially to see what Material is a Node, or what is the "base material" Best solution is to completely separate the two. This has been implemented as follows now; - The confusing "Input" node has been removed. - When choosing a Material in Blender, you can define this Material to be either 'normal' (default) or be the root of a Node tree. - If a Material is a Node tree, you have to add Nodes in the tree to see something happen. An empty Node tree doesn't do anything (black). - If a Material is a Node Tree, the 'data browse' menus show it with an 'N' mark before the name. The 'data block' buttons display it with the suffix 'NT' (instead of 'MA'). - In a Node Tree, any Material can be inserted, including itself. Only in that case the Material is being used itself for shading. UI changes: Added a new Panel "Links", which shows: - where the Material is linked to (Object, Mesh, etc) - if the Material is a NodeTree or not - the actual active Material in the Tree The "Node" Panel itself now only shows buttons from the other nodes, when they are active. Further the Material Nodes themselves allow browsing and renaming or adding new Materials now too. Second half of today's work was cleaning up selection when the Nodes overlap... it was possible to drag links from invisible sockets, or click headers for invisible nodes, etc. This because the mouse input code was not checking for visibility yet. Works now even for buttons. :) |
Commit Details:
Full Hash: 8d352139909653e881c99205e71f34f689ff6292
SVN Revision: 6246
Parent Commit: fa24217
Lines Changed: +616, -680
1 Deleted Path:
/source/blender/include/BSE_buttons.h (+0, -39)
32 Modified Paths:
/source/blender/blenkernel/BKE_node.h (+2, -2) (Diff)
/source/blender/blenkernel/intern/library.c (+10, -3) (Diff)
/source/blender/blenkernel/intern/material.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+39, -5) (Diff)
/source/blender/blenkernel/intern/node_shaders.c (+6, -50) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -2) (Diff)
/source/blender/include/BSE_headerbuttons.h (+1, -1) (Diff)
/source/blender/include/butspace.h (+3, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+7, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+2, -2) (Diff)
/source/blender/src/buttons_editing.c (+1, -2) (Diff)
/source/blender/src/buttons_logic.c (+0, -1) (Diff)
/source/blender/src/buttons_object.c (+1, -1) (Diff)
/source/blender/src/buttons_scene.c (+1, -1) (Diff)
/source/blender/src/buttons_shading.c (+143, -204) (Diff)
/source/blender/src/drawimage.c (+1, -1) (Diff)
/source/blender/src/drawnode.c (+179, -121) (Diff)
/source/blender/src/editnode.c (+137, -47) (Diff)
/source/blender/src/headerbuttons.c (+47, -135) (Diff)
/source/blender/src/header_action.c (+1, -1) (Diff)
/source/blender/src/header_image.c (+1, -1) (Diff)
/source/blender/src/header_info.c (+2, -2) (Diff)
/source/blender/src/header_ipo.c (+1, -1) (Diff)
/source/blender/src/header_node.c (+1, -1) (Diff)
/source/blender/src/header_script.c (+1, -1) (Diff)
/source/blender/src/header_sound.c (+1, -1) (Diff)
/source/blender/src/header_text.c (+1, -1) (Diff)
/source/blender/src/interface.c (+20, -8) (Diff)
/source/blender/src/interface_panel.c (+2, -14) (Diff)
/source/blender/src/previewrender.c (+1, -23) (Diff)
/source/blender/src/toolbox.c (+0, -4) (Diff)
/source/blender/src/usiblender.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+10, -3) (Diff)
/source/blender/blenkernel/intern/material.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+39, -5) (Diff)
/source/blender/blenkernel/intern/node_shaders.c (+6, -50) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -2) (Diff)
/source/blender/include/BSE_headerbuttons.h (+1, -1) (Diff)
/source/blender/include/butspace.h (+3, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+7, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+2, -2) (Diff)
/source/blender/src/buttons_editing.c (+1, -2) (Diff)
/source/blender/src/buttons_logic.c (+0, -1) (Diff)
/source/blender/src/buttons_object.c (+1, -1) (Diff)
/source/blender/src/buttons_scene.c (+1, -1) (Diff)
/source/blender/src/buttons_shading.c (+143, -204) (Diff)
/source/blender/src/drawimage.c (+1, -1) (Diff)
/source/blender/src/drawnode.c (+179, -121) (Diff)
/source/blender/src/editnode.c (+137, -47) (Diff)
/source/blender/src/headerbuttons.c (+47, -135) (Diff)
/source/blender/src/header_action.c (+1, -1) (Diff)
/source/blender/src/header_image.c (+1, -1) (Diff)
/source/blender/src/header_info.c (+2, -2) (Diff)
/source/blender/src/header_ipo.c (+1, -1) (Diff)
/source/blender/src/header_node.c (+1, -1) (Diff)
/source/blender/src/header_script.c (+1, -1) (Diff)
/source/blender/src/header_sound.c (+1, -1) (Diff)
/source/blender/src/header_text.c (+1, -1) (Diff)
/source/blender/src/interface.c (+20, -8) (Diff)
/source/blender/src/interface_panel.c (+2, -14) (Diff)
/source/blender/src/previewrender.c (+1, -23) (Diff)
/source/blender/src/toolbox.c (+0, -4) (Diff)
/source/blender/src/usiblender.c (+2, -0) (Diff)