[Bf-blender-cvs] [50dd619] blender-v2.76a-release: Fix T46487: OpenSubdiv objects are invisible in Blender Internal "Rendered" viewport mode

[Sergey Sharybin]

Commit: 50dd619e8882998ae5f1960d443521caf0386079
Author: Sergey Sharybin
Date:   Thu Oct 15 00:17:54 2015 +0500
Branches: blender-v2.76a-release
https://developer.blender.org/rB50dd619e8882998ae5f1960d443521caf0386079

Fix T46487: OpenSubdiv objects are invisible in Blender Internal "Rendered" viewport mode

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

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 cbd7bc9..23ab618 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");