Cycles microdisplacement: Move displacement options from mesh to material settings
authorMai Lavelle <mai.lavelle@gmail.com>
Tue, 2 Aug 2016 09:13:58 +0000 (05:13 -0400)
committerMai Lavelle <mai.lavelle@gmail.com>
Sun, 7 Aug 2016 18:15:20 +0000 (14:15 -0400)
commita58fe05c05dfc2a5d63a3d1977bcb15f7778990f
tree4da4ac22208668167228a7440901264e0f3f38fd
parentdd1929754f3f5746dea5837425ac8e8768aef2d9
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
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_shader.cpp
intern/cycles/render/mesh.cpp
intern/cycles/render/mesh.h
intern/cycles/render/mesh_displace.cpp
intern/cycles/render/object.cpp
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h