[Bf-blender-cvs] [3db3145] master: OpenSubdiv: Make it more obvious that None compute type actually disables OpenSubdiv

[Sergey Sharybin]

Commit: 3db3145c33ea414cac576ae624c3497d32b7e748
Author: Sergey Sharybin
Date:   Tue Aug 25 13:23:06 2015 +0200
Branches: master
https://developer.blender.org/rB3db3145c33ea414cac576ae624c3497d32b7e748

OpenSubdiv: Make it more obvious that None compute type actually disables OpenSubdiv

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

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 75b2fe2..88d461b 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -37,6 +37,7 @@
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_userdef_types.h"
 
 #include "BLI_utildefines.h"
 
@@ -125,7 +126,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	    do_cddm_convert == false &&
 	    smd->use_opensubdiv)
 	{
-		if ((DAG_get_eval_flags_for_object(md->scene, ob) & DAG_EVAL_NEED_CPU) == 0) {
+		if (U.opensubdiv_compute_type == USER_OPENSUBDIV_COMPUTE_NONE) {
+			modifier_setError(md, "OpenSubdiv is disabled in User Preferences");
+		}
+		else if ((DAG_get_eval_flags_for_object(md->scene, ob) & DAG_EVAL_NEED_CPU) == 0) {
 			subsurf_flags |= SUBSURF_USE_GPU_BACKEND;
 		}
 		else {