[Bf-blender-cvs] [bfa51b1b0c7] blender2.8: Fix subsurf modifier after error in merge commit

[Mai Lavelle]

Commit: bfa51b1b0c705780bccbf551e81baa5846fd6a85
Author: Mai Lavelle
Date:   Wed Feb 21 04:38:10 2018 -0500
Branches: blender2.8
https://developer.blender.org/rBbfa51b1b0c705780bccbf551e81baa5846fd6a85

Fix subsurf modifier after error in merge commit

Merge commit that had the error: e99094035c493a4e0b

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 32a1b3a771d..cd29c3f10e7 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -940,7 +940,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col = split.column()
 
         scene = context.scene
-        engine = scene.render.engine
+        engine = scene.view_render.engine
         show_adaptive_options = (
             engine == 'CYCLES' and md == ob.modifiers[-1] and
             scene.cycles.feature_set == 'EXPERIMENTAL'