Blender Git Loki
Git Commits -> Revision df07a25
Revision df07a25 by Sergey Sharybin (master) January 27, 2015, 08:36 (GMT) |
Cycles: Support texture coordinate from another object This is the same as blender internal's texture mapping from another object, so this way it's possible to control texture space of one object by another. Quite straightforward change apart from the workaround for the stupidness of the dependency graph. Now shader has flag telling that it depends on object transform. This is the simplest way to know which shaders needs to be tagged for update when object changes. This might give some false-positive tags now but reducing them should not be priority for Cycles and rather be a priority to bring new dependency graph. Also GLSL preview does not support using other object for mapping. This is actually correct for BI shading as well and to be addressed as a part of general GLSL viewport improvements since it's not really clear how to support this in GLSL. Reviewers: brecht, juicyfruit Subscribers: eyecandy, venomgfx Differential Revision: https://developer.blender.org/D1021 |
Commit Details:
Full Hash: df07a25d2811c43648af3e9bf4cc44d255218d65
Parent Commit: ddc0d28
Lines Changed: +85, -12
14 Modified Paths:
/intern/cycles/blender/blender_shader.cpp (+4, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+11, -3) (Diff)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+8, -1) (Diff)
/intern/cycles/kernel/svm/svm.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+21, -3) (Diff)
/intern/cycles/render/graph.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+14, -2) (Diff)
/intern/cycles/render/nodes.h (+4, -1) (Diff)
/intern/cycles/render/osl.cpp (+5, -0) (Diff)
/intern/cycles/render/shader.cpp (+1, -0) (Diff)
/intern/cycles/render/shader.h (+1, -0) (Diff)
/intern/cycles/render/svm.cpp (+5, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+8, -1) (Diff)
/intern/cycles/blender/blender_sync.cpp (+11, -3) (Diff)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+8, -1) (Diff)
/intern/cycles/kernel/svm/svm.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+21, -3) (Diff)
/intern/cycles/render/graph.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+14, -2) (Diff)
/intern/cycles/render/nodes.h (+4, -1) (Diff)
/intern/cycles/render/osl.cpp (+5, -0) (Diff)
/intern/cycles/render/shader.cpp (+1, -0) (Diff)
/intern/cycles/render/shader.h (+1, -0) (Diff)
/intern/cycles/render/svm.cpp (+5, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+8, -1) (Diff)