Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMai Lavelle <mai.lavelle@gmail.com>2018-02-21 12:38:10 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2018-02-21 12:38:29 +0300
commitbfa51b1b0c705780bccbf551e81baa5846fd6a85 (patch)
tree3c452da9511ac63e412f3b6fe417e98b774fb801
parent78ceb4b51ed92ba2a1aca5bbca9dacea00b6b51a (diff)
Fix subsurf modifier after error in merge commit
Merge commit that had the error: e99094035c493a4e0b
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py2
1 files changed, 1 insertions, 1 deletions
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'