Blender Git Loki
Git Commits -> Revision 878a315
Revision 878a315 by Mai Lavelle (temp-cycles-microdisplacement) April 11, 2016, 12:52 (GMT) |
Add displacement scale option to displaced meshes |
Commit Details:
Full Hash: 878a315880ba0ffe4145ccccc6ae718af85727d6
Parent Commit: ecb8796
Committed By: Lukas Stockner
Lines Changed: +64, -14
18 Modified Paths:
/intern/cycles/blender/addon/properties.py (+6, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+1, -0) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+2, -0) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+13, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+5, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+3, -0) (Diff)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+3, -1) (Diff)
/intern/cycles/kernel/svm/svm.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+7, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+5, -0) (Diff)
/intern/cycles/render/graph.cpp (+2, -1) (Diff)
/intern/cycles/render/mesh.cpp (+2, -0) (Diff)
/intern/cycles/render/mesh.h (+2, -0) (Diff)
/intern/cycles/render/nodes.cpp (+4, -1) (Diff)
/intern/cycles/render/nodes.h (+3, -1) (Diff)
/intern/cycles/render/object.cpp (+3, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+1, -0) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+2, -0) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+13, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+5, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+3, -0) (Diff)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+3, -1) (Diff)
/intern/cycles/kernel/svm/svm.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+7, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+5, -0) (Diff)
/intern/cycles/render/graph.cpp (+2, -1) (Diff)
/intern/cycles/render/mesh.cpp (+2, -0) (Diff)
/intern/cycles/render/mesh.h (+2, -0) (Diff)
/intern/cycles/render/nodes.cpp (+4, -1) (Diff)
/intern/cycles/render/nodes.h (+3, -1) (Diff)
/intern/cycles/render/object.cpp (+3, -2) (Diff)