[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_bad_level_calls.h BKE_material.h blender/source/blender/blenkernel/bad_level_call_stubs stubs.c blender/source/blender/blenkernel/intern displist.c material.c blender/source/blender/blenloader/intern readfile.c writefile.c blender/source/blender/include butspace.h ...

[Ton Roosendaal]

ton (Ton Roosendaal) 2005/12/04 15:32:21 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel BKE_bad_level_calls.h 
                                      BKE_material.h 
    blender/source/blender/blenkernel/bad_level_call_stubs stubs.c 
    blender/source/blender/blenkernel/intern displist.c material.c 
    blender/source/blender/blenloader/intern readfile.c 
                                             writefile.c 
    blender/source/blender/include butspace.h 
    blender/source/blender/makesdna DNA_material_types.h 
    blender/source/blender/render/extern/include render.h 
                                                 render_types.h 
    blender/source/blender/render/intern/include rendercore.h 
    blender/source/blender/render/intern/source initrender.c 
                                                rendercore.c 
                                                texture.c 
    blender/source/blender/renderconverter/intern 
                                                  convertBlenderScene.c 
    blender/source/blender/src buttons_shading.c drawview.c 
                               editobject.c header_buttonswin.c 
                               headerbuttons.c interface_panel.c 
                               previewrender.c 
  
  Log:
  Orange branch feature; Material Layering
  
  (WIP, don't bugs for this in tracker yet please!)
  
  - New Panel "Layers" in Material buttons, allows to add unlimited amount
    of materials on top of each other.
  - Every Layer is actually just another Material, which gets rendered/shaded
    (including texture), and then added on top of previous layer with an
    operation like Mix, Add, Mult, etc.
  - Layers render fully independent, so bumpmaps are not passed on to next
    layers.
  - Per Layer you can set if it influences Diffuse, Specular or Alpha
  - If a Material returns alpha (like from texture), the alpha value is
    used for adding the layers too.
  - New texture "Map To" channel allows to have a texture work on a Layer
  - Each layer, including basis Material, can be turned on/off individually
  
  Notes:
  
  - at this moment, the full shading pass happens for each layer, including
    shadow, AO and raytraced mirror or transparency...
  - I had to remove old hacks from preview render, which corrected reflected
    normals for preview texturing.
  - still needs loadsa testing!
  
  Revision  Changes    Path
  1.19.2.1  +1 -2      blender/source/blender/blenkernel/BKE_bad_level_calls.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_bad_level_calls.h.diff?r1=1.19.2.0&r2=1.19.2.1&cvsroot=bf-blender>
  1.5.2.1   +5 -3      blender/source/blender/blenkernel/BKE_material.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_material.h.diff?r1=1.5.2.0&r2=1.5.2.1&cvsroot=bf-blender>
  1.35.2.1  +1 -3      blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.35.2.0&r2=1.35.2.1&cvsroot=bf-blender>
  1.123.2.3 +1 -15     blender/source/blender/blenkernel/intern/displist.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/displist.c.diff?r1=1.123.2.2&r2=1.123.2.3&cvsroot=bf-blender>
  1.32.2.2  +66 -38    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.1&r2=1.32.2.2&cvsroot=bf-blender>
  1.214.2.2 +24 -13    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.1&r2=1.214.2.2&cvsroot=bf-blender>
  1.60.2.1  +6 -1      blender/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/writefile.c.diff?r1=1.60.2.0&r2=1.60.2.1&cvsroot=bf-blender>
  1.69.2.2  +1 -0      blender/source/blender/include/butspace.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/butspace.h.diff?r1=1.69.2.1&r2=1.69.2.2&cvsroot=bf-blender>
  1.30.2.2  +30 -10    blender/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_material_types.h.diff?r1=1.30.2.1&r2=1.30.2.2&cvsroot=bf-blender>
  1.18.2.1  +5 -4      blender/source/blender/render/extern/include/render.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/extern/include/render.h.diff?r1=1.18.2.0&r2=1.18.2.1&cvsroot=bf-blender>
  1.34.2.2  +14 -7     blender/source/blender/render/extern/include/render_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/extern/include/render_types.h.diff?r1=1.34.2.1&r2=1.34.2.2&cvsroot=bf-blender>
  1.21.2.2  +0 -8      blender/source/blender/render/intern/include/rendercore.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/include/rendercore.h.diff?r1=1.21.2.1&r2=1.21.2.2&cvsroot=bf-blender>
  1.69.2.1  +1 -2      blender/source/blender/render/intern/source/initrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/initrender.c.diff?r1=1.69.2.0&r2=1.69.2.1&cvsroot=bf-blender>
  1.126.2.6 +136 -62   blender/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/rendercore.c.diff?r1=1.126.2.5&r2=1.126.2.6&cvsroot=bf-blender>
  1.53.2.2  +10 -24    blender/source/blender/render/intern/source/texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/texture.c.diff?r1=1.53.2.1&r2=1.53.2.2&cvsroot=bf-blender>
  1.178.2.2 +1 -3      blender/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.178.2.1&r2=1.178.2.2&cvsroot=bf-blender>
  1.157.2.4 +254 -49   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.3&r2=1.157.2.4&cvsroot=bf-blender>
  1.181.2.2 +1 -2      blender/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawview.c.diff?r1=1.181.2.1&r2=1.181.2.2&cvsroot=bf-blender>
  1.279.2.3 +39 -23    blender/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editobject.c.diff?r1=1.279.2.2&r2=1.279.2.3&cvsroot=bf-blender>
  1.38.2.1  +21 -2     blender/source/blender/src/header_buttonswin.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_buttonswin.c.diff?r1=1.38.2.0&r2=1.38.2.1&cvsroot=bf-blender>
  1.120.2.1 +12 -1     blender/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/headerbuttons.c.diff?r1=1.120.2.0&r2=1.120.2.1&cvsroot=bf-blender>
  1.33.2.1  +3 -3      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.0&r2=1.33.2.1&cvsroot=bf-blender>
  1.61.2.1  +307 -280  blender/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/previewrender.c.diff?r1=1.61.2.0&r2=1.61.2.1&cvsroot=bf-blender>