[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_node.h blender/source/blender/blenkernel/intern library.c material.c node.c node_shaders.c blender/source/blender/blenloader/intern readfile.c blender/source/blender/include BSE_headerbuttons.h butspace.h BSE_buttons.h ...

[Ton Roosendaal]

ton (Ton Roosendaal) 2005/12/29 19:08:02 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel BKE_node.h 
    blender/source/blender/blenkernel/intern library.c material.c 
                                             node.c node_shaders.c 
    blender/source/blender/blenloader/intern readfile.c 
    blender/source/blender/include BSE_headerbuttons.h butspace.h 
    blender/source/blender/makesdna DNA_node_types.h 
                                    DNA_space_types.h 
    blender/source/blender/src buttons_editing.c buttons_logic.c 
                               buttons_object.c buttons_scene.c 
                               buttons_shading.c drawimage.c 
                               drawnode.c editnode.c 
                               header_action.c header_image.c 
                               header_info.c header_ipo.c 
                               header_node.c header_script.c 
                               header_sound.c header_text.c 
                               headerbuttons.c interface.c 
                               interface_panel.c previewrender.c 
                               toolbox.c usiblender.c 
  Removed files:         (Branch: orange)
    blender/source/blender/include BSE_buttons.h 
  
  Log:
  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. :)
  
  Revision  Changes    Path
  1.1.2.6   +2 -2      blender/source/blender/blenkernel/Attic/BKE_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/Attic/BKE_node.h.diff?r1=1.1.2.5&r2=1.1.2.6&cvsroot=bf-blender>
  1.15.2.3  +11 -4     blender/source/blender/blenkernel/intern/library.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/library.c.diff?r1=1.15.2.2&r2=1.15.2.3&cvsroot=bf-blender>
  1.32.2.7  +1 -0      blender/source/blender/blenkernel/intern/material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/material.c.diff?r1=1.32.2.6&r2=1.32.2.7&cvsroot=bf-blender>
  1.1.2.6   +39 -5     blender/source/blender/blenkernel/intern/Attic/node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/Attic/node.c.diff?r1=1.1.2.5&r2=1.1.2.6&cvsroot=bf-blender>
  1.1.2.3   +7 -51     blender/source/blender/blenkernel/intern/Attic/node_shaders.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/Attic/node_shaders.c.diff?r1=1.1.2.2&r2=1.1.2.3&cvsroot=bf-blender>
  1.214.2.26 +1 -2      blender/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.214.2.25&r2=1.214.2.26&cvsroot=bf-blender>
  1.24.2.2  +1 -1      blender/source/blender/include/BSE_headerbuttons.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BSE_headerbuttons.h.diff?r1=1.24.2.1&r2=1.24.2.2&cvsroot=bf-blender>
  1.69.2.6  +3 -2      blender/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/butspace.h.diff?r1=1.69.2.5&r2=1.69.2.6&cvsroot=bf-blender>
  1.1.2.8   +7 -3      blender/source/blender/makesdna/Attic/DNA_node_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/Attic/DNA_node_types.h.diff?r1=1.1.2.7&r2=1.1.2.8&cvsroot=bf-blender>
  1.38.2.6  +2 -2      blender/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_space_types.h.diff?r1=1.38.2.5&r2=1.38.2.6&cvsroot=bf-blender>
  1.235.2.9 +1 -2      blender/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_editing.c.diff?r1=1.235.2.8&r2=1.235.2.9&cvsroot=bf-blender>
  1.30.2.2  +1 -2      blender/source/blender/src/buttons_logic.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_logic.c.diff?r1=1.30.2.1&r2=1.30.2.2&cvsroot=bf-blender>
  1.139.2.8 +2 -2      blender/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_object.c.diff?r1=1.139.2.7&r2=1.139.2.8&cvsroot=bf-blender>
  1.99.2.1  +2 -2      blender/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_scene.c.diff?r1=1.99.2.0&r2=1.99.2.1&cvsroot=bf-blender>
  1.157.2.16 +143 -204  blender/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_shading.c.diff?r1=1.157.2.15&r2=1.157.2.16&cvsroot=bf-blender>
  1.47.2.4  +1 -1      blender/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawimage.c.diff?r1=1.47.2.3&r2=1.47.2.4&cvsroot=bf-blender>
  1.1.2.8   +178 -120  blender/source/blender/src/Attic/drawnode.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/drawnode.c.diff?r1=1.1.2.7&r2=1.1.2.8&cvsroot=bf-blender>
  1.1.2.9   +137 -47   blender/source/blender/src/Attic/editnode.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/editnode.c.diff?r1=1.1.2.8&r2=1.1.2.9&cvsroot=bf-blender>
  1.38.2.2  +2 -2      blender/source/blender/src/header_action.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_action.c.diff?r1=1.38.2.1&r2=1.38.2.2&cvsroot=bf-blender>
  1.48.2.4  +2 -2      blender/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_image.c.diff?r1=1.48.2.3&r2=1.48.2.4&cvsroot=bf-blender>
  1.74.2.4  +2 -2      blender/source/blender/src/header_info.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_info.c.diff?r1=1.74.2.3&r2=1.74.2.4&cvsroot=bf-blender>
  1.37.2.2  +1 -1      blender/source/blender/src/header_ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_ipo.c.diff?r1=1.37.2.1&r2=1.37.2.2&cvsroot=bf-blender>
  1.1.2.3   +1 -1      blender/source/blender/src/Attic/header_node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/Attic/header_node.c.diff?r1=1.1.2.2&r2=1.1.2.3&cvsroot=bf-blender>
  1.16.2.1  +2 -2      blender/source/blender/src/header_script.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_script.c.diff?r1=1.16.2.0&r2=1.16.2.1&cvsroot=bf-blender>
  1.19.2.1  +2 -2      blender/source/blender/src/header_sound.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_sound.c.diff?r1=1.19.2.0&r2=1.19.2.1&cvsroot=bf-blender>
  1.28.2.1  +2 -2      blender/source/blender/src/header_text.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_text.c.diff?r1=1.28.2.0&r2=1.28.2.1&cvsroot=bf-blender>
  1.120.2.4 +47 -135   blender/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/headerbuttons.c.diff?r1=1.120.2.3&r2=1.120.2.4&cvsroot=bf-blender>
  1.217.2.6 +20 -8     blender/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface.c.diff?r1=1.217.2.5&r2=1.217.2.6&cvsroot=bf-blender>
  1.33.2.6  +3 -15     blender/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface_panel.c.diff?r1=1.33.2.5&r2=1.33.2.6&cvsroot=bf-blender>
  1.61.2.8  +1 -23     blender/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/previewrender.c.diff?r1=1.61.2.7&r2=1.61.2.8&cvsroot=bf-blender>
  1.117.2.4 +0 -4      blender/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toolbox.c.diff?r1=1.117.2.3&r2=1.117.2.4&cvsroot=bf-blender>
  1.97.2.2  +2 -0      blender/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/usiblender.c.diff?r1=1.97.2.1&r2=1.97.2.2&cvsroot=bf-blender>