diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-25 14:23:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-25 14:23:06 +0300 |
| commit | 3db3145c33ea414cac576ae624c3497d32b7e748 (patch) | |
| tree | dc8efef4ff6353aa436ab1ae8e9c924945b5afa8 /source/blender/modifiers | |
| parent | 0d33d30cc620eac83eaad09bc66e3639eabf5c55 (diff) | |
OpenSubdiv: Make it more obvious that None compute type actually disables OpenSubdiv
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 75b2fe2290c..88d461bb84d 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 { |