Blender Git Loki
Git Commits -> Revision 8f7311d
Revision 8f7311d by Mai Lavelle (temp-cycles-microdisplacement) August 2, 2016, 10:22 (GMT) |
Move displacement options from mesh settings to material settings Displacement is now a per material setting, which means old files will have to be updated if they had used displacement. Cool side effect of this change is material previews now show displacement. |
Commit Details:
Full Hash: 8f7311d0800d5a0cc1f8a6125a584e08df9f9f31
Parent Commit: 57020d5
Lines Changed: +201, -89
10 Modified Paths:
/intern/cycles/blender/addon/properties.py (+7, -7) (Diff)
/intern/cycles/blender/addon/ui.py (+5, -34) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+0, -15) (Diff)
/intern/cycles/blender/blender_shader.cpp (+9, -0) (Diff)
/intern/cycles/render/mesh.cpp (+12, -7) (Diff)
/intern/cycles/render/mesh.h (+1, -10) (Diff)
/intern/cycles/render/mesh_displace.cpp (+146, -14) (Diff)
/intern/cycles/render/object.cpp (+1, -1) (Diff)
/intern/cycles/render/shader.cpp (+9, -1) (Diff)
/intern/cycles/render/shader.h (+11, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+5, -34) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+0, -15) (Diff)
/intern/cycles/blender/blender_shader.cpp (+9, -0) (Diff)
/intern/cycles/render/mesh.cpp (+12, -7) (Diff)
/intern/cycles/render/mesh.h (+1, -10) (Diff)
/intern/cycles/render/mesh_displace.cpp (+146, -14) (Diff)
/intern/cycles/render/object.cpp (+1, -1) (Diff)
/intern/cycles/render/shader.cpp (+9, -1) (Diff)
/intern/cycles/render/shader.h (+11, -0) (Diff)