diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 02:20:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 02:20:59 +0300 |
| commit | 7b1d7074817dac9d0f088e8e7e5b336bae662c36 (patch) | |
| tree | 4ebd67459d2fc160d3a6c76a2509cefc68f4e89c /intern/cycles/blender | |
| parent | 1b18e158025a488e1ba2446ad93c2eb563c11611 (diff) | |
| parent | a0478ebe379c8384376586e2880ebc813a6afef7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 51f8e1df068..50a95777a0f 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -860,6 +860,12 @@ static ShaderNode *add_node(Scene *scene, transform_inverse(get_transform(b_ob.matrix_world())); } } + else if(b_node.is_a(&RNA_ShaderNodeBevel)) { + BL::ShaderNodeBevel b_bevel_node(b_node); + BevelNode *bevel = new BevelNode(); + bevel->samples = b_bevel_node.samples(); + node = bevel; + } if(node) { node->name = b_node.name(); |