diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-14 22:17:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-14 22:19:38 +0300 |
| commit | 59ba52628f1a8629bb849acbbb9a3a2d7e0478fa (patch) | |
| tree | 4c29b73d34424c482227dde6dacd794f8bdb4b93 /source | |
| parent | 51fc7aee34237c1d4acf333e898d844d1928d842 (diff) | |
Fix T46487: OpenSubdiv objects are invisible in Blender Internal "Rendered" viewport mode
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index cbd7bc97768..23ab61821f4 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -108,10 +108,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, #ifdef WITH_OPENSUBDIV const bool allow_gpu = (flag & MOD_APPLY_ALLOW_GPU) != 0; - const bool do_cddm_convert = useRenderParams || (!isFinalCalc && !smd->use_opensubdiv); -#else - const bool do_cddm_convert = useRenderParams || !isFinalCalc; #endif + bool do_cddm_convert = useRenderParams || !isFinalCalc; if (useRenderParams) subsurf_flags |= SUBSURF_USE_RENDER_PARAMS; @@ -134,6 +132,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } else if ((DAG_get_eval_flags_for_object(md->scene, ob) & DAG_EVAL_NEED_CPU) == 0) { subsurf_flags |= SUBSURF_USE_GPU_BACKEND; + do_cddm_convert = false; } else { modifier_setError(md, "OpenSubdiv is disabled due to dependencies"); |