Blender Git Loki
Git Commits -> Revision a58fe05
Revision a58fe05 by Mai Lavelle (master) August 7, 2016, 18:15 (GMT) |
Cycles microdisplacement: Move displacement options from mesh 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. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2140 |
Commit Details:
Full Hash: a58fe05c05dfc2a5d63a3d1977bcb15f7778990f
Parent Commit: dd19297
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)