[Bf-blender-cvs] [9d087ad] master: Fix T46130: Vertex/wire no visible with OpenSubdiv in edit mode

[Sergey Sharybin]

Commit: 9d087ad0b572cc42572034fa1fa8eb987faa7a3c
Author: Sergey Sharybin
Date:   Wed Sep 16 23:00:50 2015 +0500
Branches: master
https://developer.blender.org/rB9d087ad0b572cc42572034fa1fa8eb987faa7a3c

Fix T46130: Vertex/wire no visible with OpenSubdiv in edit mode

For now simply show warning in the interface and fallback to regular subsurf
code. Supporting OpenSubdiv in edit mode in possible but not high priority
currently.

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

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 ab52d79..cbd7bc9 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -164,11 +164,8 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob),
 	SubsurfFlags ss_flags = (flag & MOD_APPLY_ORCO) ? 0 : (SUBSURF_FOR_EDIT_MODE | SUBSURF_IN_EDIT_MODE);
 #ifdef WITH_OPENSUBDIV
 	const bool allow_gpu = (flag & MOD_APPLY_ALLOW_GPU) != 0;
-	/* TODO(sergey): Not entirely correct, modifiers on top of subsurf
-	 * could be disabled.
-	 */
 	if (md->next == NULL && allow_gpu && smd->use_opensubdiv) {
-		ss_flags |= SUBSURF_USE_GPU_BACKEND;
+		modifier_setError(md, "OpenSubdiv is not supported in edit mode");
 	}
 #endif