Blender Git Loki
Git Commits -> Revision aa939b8
Revision aa939b8 by Ton Roosendaal (master) December 4, 2005, 14:32 (GMT) |
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! |
Commit Details:
Full Hash: aa939b859904fcfad5c6782e14621da74bbf8118
SVN Revision: 6010
Parent Commit: c2cff1c
Lines Changed: +920, -536
23 Modified Paths:
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+0, -2) (Diff)
/source/blender/blenkernel/BKE_bad_level_calls.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_material.h (+4, -2) (Diff)
/source/blender/blenkernel/intern/displist.c (+0, -14) (Diff)
/source/blender/blenkernel/intern/material.c (+65, -37) (Diff)
/source/blender/blenloader/intern/readfile.c (+23, -12) (Diff)
/source/blender/blenloader/intern/writefile.c (+5, -0) (Diff)
/source/blender/include/butspace.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+29, -9) (Diff)
/source/blender/render/extern/include/render.h (+4, -3) (Diff)
/source/blender/render/extern/include/render_types.h (+14, -7) (Diff)
/source/blender/render/intern/include/rendercore.h (+0, -8) (Diff)
/source/blender/render/intern/source/initrender.c (+0, -1) (Diff)
/source/blender/render/intern/source/rendercore.c (+135, -61) (Diff)
/source/blender/render/intern/source/texture.c (+10, -24) (Diff)
/source/blender/renderconverter/intern/convertBlenderScene.c (+0, -2) (Diff)
/source/blender/src/buttons_shading.c (+254, -49) (Diff)
/source/blender/src/drawview.c (+0, -1) (Diff)
/source/blender/src/editobject.c (+38, -22) (Diff)
/source/blender/src/headerbuttons.c (+11, -0) (Diff)
/source/blender/src/header_buttonswin.c (+20, -1) (Diff)
/source/blender/src/interface_panel.c (+2, -2) (Diff)
/source/blender/src/previewrender.c (+305, -278) (Diff)
/source/blender/blenkernel/BKE_bad_level_calls.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_material.h (+4, -2) (Diff)
/source/blender/blenkernel/intern/displist.c (+0, -14) (Diff)
/source/blender/blenkernel/intern/material.c (+65, -37) (Diff)
/source/blender/blenloader/intern/readfile.c (+23, -12) (Diff)
/source/blender/blenloader/intern/writefile.c (+5, -0) (Diff)
/source/blender/include/butspace.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+29, -9) (Diff)
/source/blender/render/extern/include/render.h (+4, -3) (Diff)
/source/blender/render/extern/include/render_types.h (+14, -7) (Diff)
/source/blender/render/intern/include/rendercore.h (+0, -8) (Diff)
/source/blender/render/intern/source/initrender.c (+0, -1) (Diff)
/source/blender/render/intern/source/rendercore.c (+135, -61) (Diff)
/source/blender/render/intern/source/texture.c (+10, -24) (Diff)
/source/blender/renderconverter/intern/convertBlenderScene.c (+0, -2) (Diff)
/source/blender/src/buttons_shading.c (+254, -49) (Diff)
/source/blender/src/drawview.c (+0, -1) (Diff)
/source/blender/src/editobject.c (+38, -22) (Diff)
/source/blender/src/headerbuttons.c (+11, -0) (Diff)
/source/blender/src/header_buttonswin.c (+20, -1) (Diff)
/source/blender/src/interface_panel.c (+2, -2) (Diff)
/source/blender/src/previewrender.c (+305, -278) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021