[Bf-blender-cvs] [772dab9] master: Cycles: Fix typo that would sometimes result in subsurf modifier being disabled

[Mai Lavelle]

Commit: 772dab9df1fb208bfe2486b7ca6760da051f42f6
Author: Mai Lavelle
Date:   Sun Sep 18 22:11:07 2016 -0400
Branches: master
https://developer.blender.org/rB772dab9df1fb208bfe2486b7ca6760da051f42f6

Cycles: Fix typo that would sometimes result in subsurf modifier being disabled

===================================================================

M	intern/cycles/blender/blender_util.h

===================================================================

diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index e606696..f17a61f 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);