diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-09-19 05:11:07 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-09-19 05:14:15 +0300 |
| commit | 772dab9df1fb208bfe2486b7ca6760da051f42f6 (patch) | |
| tree | f8ababdb9d4ef2dd3ad8cabe9a4be01a18a6212d /intern/cycles/blender/blender_util.h | |
| parent | c2d7d4764e86d8a133168ff8ea9aedbd78b5cd72 (diff) | |
Cycles: Fix typo that would sometimes result in subsurf modifier being disabled
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index e606696fb7b..f17a61f0ac8 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -57,11 +57,10 @@ static inline BL::Mesh object_to_mesh(BL::BlendData& data, BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length()-1]; subsurf_mod_show_render = subsurf_mod.show_render(); - subsurf_mod_show_viewport = subsurf_mod.show_render(); + subsurf_mod_show_viewport = subsurf_mod.show_viewport(); subsurf_mod.show_render(false); subsurf_mod.show_viewport(false); - } BL::Mesh me = data.meshes.new_from_object(scene, object, apply_modifiers, (render)? 2: 1, false, calc_undeformed); |