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:
authorCampbell Barton <ideasman42@gmail.com>2018-03-21 18:27:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-03-21 18:27:48 +0300
commit69eb452622e9af340f14b7116d59e450c3b6c745 (patch)
treebe5dd24893507bbba968d3114da06de60e9e83eb /release
parent3ea8710b9daaed9bbf160c8b7895f2d6fdb0337c (diff)
parent5ba5254ec1ebba6c1e89b663592d716b92e13165 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 5ee722f58ed..3449280f862 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -213,7 +213,6 @@ class USERPREF_PT_interface(Panel):
return (userpref.active_section == 'INTERFACE')
def draw(self, context):
- import sys
layout = self.layout
userpref = context.user_preferences
@@ -245,9 +244,8 @@ class USERPREF_PT_interface(Panel):
col.separator()
- if sys.platform[:3] == "win":
- col.label("Warnings")
- col.prop(view, "use_quit_dialog")
+ col.label("Warnings")
+ col.prop(view, "use_quit_dialog")
row.separator()
row.separator()