diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
| commit | d8e2ed8ae2257c9e301dd85127cab5d6cc2b6a58 (patch) | |
| tree | b8402f51476ad78d175411f2ef733816dd7a4fcd /intern/cycles/blender/blender_shader.cpp | |
| parent | 5323a2f18f0e004a2e2cf6d619a6f93456c47f03 (diff) | |
| parent | db5682ac8c53377e819fd50357de580c02405fca (diff) | |
svn merge ^/trunk/blender -r50999:51100soc-2012-bratwurst
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index ebf8bb45420..b6d5cc623bb 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -490,7 +490,10 @@ static ShaderNode *add_node(BL::BlendData b_data, BL::Scene b_scene, ShaderGraph break; } case BL::ShaderNode::type_TEX_COORD: { - node = new TextureCoordinateNode(); + BL::ShaderNodeTexCoord b_tex_coord_node(b_node); + TextureCoordinateNode *tex_coord = new TextureCoordinateNode(); + tex_coord->from_dupli = b_tex_coord_node.from_dupli(); + node = tex_coord; break; } case BL::ShaderNode::type_TEX_SKY: { |