diff options
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index cdf24969a9f..83c4fe8fd3d 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -919,12 +919,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "material_offset_rim", text="Rim") def SUBSURF(self, layout, ob, md): + from bpy import context layout.row().prop(md, "subdivision_type", expand=True) split = layout.split() col = split.column() - scene = bpy.context.scene + scene = context.scene engine = scene.render.engine show_adaptive_options = (engine == "CYCLES" and md == ob.modifiers[-1] and scene.cycles.feature_set == "EXPERIMENTAL") diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 9930992e9bb..d1202adfce6 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -119,7 +119,7 @@ class TIME_MT_marker(Menu): def draw(self, context): layout = self.layout - marker_menu_generic(layout) + marker_menu_generic(layout, context) class TIME_MT_view(Menu): @@ -239,6 +239,7 @@ class TIME_MT_autokey(Menu): def marker_menu_generic(layout): + from bpy import context # layout.operator_context = 'EXEC_REGION_WIN' @@ -265,7 +266,7 @@ def marker_menu_generic(layout): layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False layout.separator() - ts = bpy.context.tool_settings + ts = context.tool_settings layout.prop(ts, "lock_markers") |