Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Dietrich <kevin.dietrich@mailoo.org>2014-04-02 13:40:29 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-04-02 13:53:44 +0400
commitcb7cfd3ab6be1cfba96cb2070ac60d224126f1ea (patch)
treeec8de38de655c8fe74835eabc7f9c68e20df322a /intern/cycles/blender
parent288147334ce81cf0be533c15f3698b88ef7c63f3 (diff)
Cycles: add dedicated UV Map node, easier to find and has convenient auto complete.
Fixes T37954. Reviewed By: brecht, dingto Differential Revision: https://developer.blender.org/D230
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/blender_shader.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 1559a96a3d3..2eafcecf026 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -668,6 +668,13 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
tangent->attribute = b_tangent_node.uv_map();
node = tangent;
}
+ else if (b_node.is_a(&RNA_ShaderNodeUVMap)) {
+ BL::ShaderNodeUVMap b_uvmap_node(b_node);
+ UVMapNode *uvm = new UVMapNode();
+ uvm->attribute = b_uvmap_node.uv_map();
+ uvm->from_dupli = b_uvmap_node.from_dupli();
+ node = uvm;
+ }
if(node)
graph->add(node);