[Bf-blender-cvs] [c8c8293] blender-v2.78-release: Cycles: Fix typo that would sometimes result in subsurf modifier being disabled

Mai Lavelle noreply at git.blender.org
Thu Sep 22 11:15:24 CEST 2016


Commit: c8c829360b704cc87e5f406120c1981351501fd2
Author: Mai Lavelle
Date:   Sun Sep 18 22:11:07 2016 -0400
Branches: blender-v2.78-release
https://developer.blender.org/rBc8c829360b704cc87e5f406120c1981351501fd2

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 e79f2bb..5a88e4b 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -55,11 +55,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);




More information about the Bf-blender-cvs mailing list