Blender Git Loki
Git Commits -> Revision 08ab3cb
Revision 08ab3cb by Omar Emara (master) August 22, 2019, 12:26 (GMT) |
Shading: Add object color to Object Info node. The object color property is added as an additional output in the Object Info node. Reviewers: brecht Differential Revision: https://developer.blender.org/D5554 |
Commit Details:
Full Hash: 08ab3cbcce1eb9c2de4953a83b50cabc44479d3c
Parent Commit: a244384
Lines Changed: +69, -24
22 Modified Paths:
/intern/cycles/blender/blender_object.cpp (+1, -0) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+11, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -2) (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_object_info.osl (+2, -0) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+4, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+6, -0) (Diff)
/intern/cycles/render/object.cpp (+5, -0) (Diff)
/intern/cycles/render/object.h (+1, -0) (Diff)
/source/blender/draw/intern/draw_manager.c (+1, -0) (Diff)
/source/blender/draw/intern/draw_manager.h (+3, -0) (Diff)
/source/blender/draw/intern/draw_manager_data.c (+8, -0) (Diff)
/source/blender/draw/intern/draw_manager_exec.c (+4, -0) (Diff)
/source/blender/gpu/GPU_material.h (+1, -1) (Diff)
/source/blender/gpu/GPU_shader_interface.h (+4, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_shader_interface.c (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_object_info.c (+3, -15) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+11, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -2) (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_object_info.osl (+2, -0) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+4, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+6, -0) (Diff)
/intern/cycles/render/object.cpp (+5, -0) (Diff)
/intern/cycles/render/object.h (+1, -0) (Diff)
/source/blender/draw/intern/draw_manager.c (+1, -0) (Diff)
/source/blender/draw/intern/draw_manager.h (+3, -0) (Diff)
/source/blender/draw/intern/draw_manager_data.c (+8, -0) (Diff)
/source/blender/draw/intern/draw_manager_exec.c (+4, -0) (Diff)
/source/blender/gpu/GPU_material.h (+1, -1) (Diff)
/source/blender/gpu/GPU_shader_interface.h (+4, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_shader_interface.c (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_object_info.c (+3, -15) (Diff)