From 772dab9df1fb208bfe2486b7ca6760da051f42f6 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Sun, 18 Sep 2016 22:11:07 -0400 Subject: Cycles: Fix typo that would sometimes result in subsurf modifier being disabled --- intern/cycles/blender/blender_util.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'intern') 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); -- cgit v1.2.3