Blender Git Loki
Git Commits -> Revision fedc8e1
Revision fedc8e1 by Brecht Van Lommel (master) October 4, 2012, 21:40 (GMT) |
Cycles: add "From Dupli" option for texture coordinate node. This gets the Generated and UV coordinates from the duplicator of instance instead of the object itself. This was used in e.g. Big Buck Bunny for texturing instanced feathers with a UV map on the bird. Many files changed, mainly to do some refactoring to get rid of G.rendering global in duplilist code. |
Commit Details:
Full Hash: fedc8e17223cc5490d465788cac211328a712e5f
SVN Revision: 51059
Parent Commit: 984e9f9
Lines Changed: +222, -80
32 Modified Paths:
/intern/cycles/blender/blender_object.cpp (+14, -3) (Diff)
/intern/cycles/blender/blender_shader.cpp (+4, -1) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -1) (Diff)
/intern/cycles/blender/blender_util.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_object.h (+23, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+24, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+4, -1) (Diff)
/intern/cycles/render/nodes.cpp (+18, -6) (Diff)
/intern/cycles/render/nodes.h (+2, -0) (Diff)
/intern/cycles/render/object.cpp (+4, -0) (Diff)
/intern/cycles/render/object.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_anim.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+50, -43) (Diff)
/source/blender/blenkernel/intern/object.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+21, -0) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+10, -1) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+5, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/intern/cycles/blender/blender_shader.cpp (+4, -1) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -1) (Diff)
/intern/cycles/blender/blender_util.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_object.h (+23, -1) (Diff)
/intern/cycles/kernel/kernel_types.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+24, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+4, -1) (Diff)
/intern/cycles/render/nodes.cpp (+18, -6) (Diff)
/intern/cycles/render/nodes.h (+2, -0) (Diff)
/intern/cycles/render/object.cpp (+4, -0) (Diff)
/intern/cycles/render/object.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_anim.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+50, -43) (Diff)
/source/blender/blenkernel/intern/object.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+21, -0) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+10, -1) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+5, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)