[Bf-blender-cvs] [6146fdc] master: OpenSubdiv: Edit mode was not checking for Use OpenSubdiv flag

Sergey Sharybin noreply at git.blender.org
Wed Aug 5 14:54:03 CEST 2015


Commit: 6146fdc7b03020871f0019768e9a044d577bd1fc
Author: Sergey Sharybin
Date:   Wed Aug 5 14:51:08 2015 +0200
Branches: master
https://developer.blender.org/rB6146fdc7b03020871f0019768e9a044d577bd1fc

OpenSubdiv: Edit mode was not checking for Use OpenSubdiv flag

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

M	source/blender/modifiers/intern/MOD_subsurf.c

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

diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index edf02ab..08c0df3 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -160,7 +160,7 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob),
 	/* TODO(sergey): Not entirely correct, modifiers on top of subsurf
 	 * could be disabled.
 	 */
-	if (md->next == NULL && allow_gpu) {
+	if (md->next == NULL && allow_gpu && smd->use_opensubdiv) {
 		ss_flags |= SUBSURF_USE_GPU_BACKEND;
 	}
 #endif




More information about the Bf-blender-cvs mailing list