diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-11 16:35:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-11 16:35:36 +0300 |
| commit | c36f4a7f7f370ebb6e944d9893d2677232d3b7f8 (patch) | |
| tree | c2030541dcaae70b2892c6838e8a3e76e24843e1 /release | |
| parent | cc63c8511cb18cc59fb2874dd5a57d89b7123bac (diff) | |
| parent | b415ed55a74c51b944cd0682fc7a81679778ac8f (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/blender.c
source/blender/makesdna/DNA_ID.h
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 0abb1876798..1089b5c699d 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -318,6 +318,9 @@ class USERPREF_PT_interface(Panel): col.separator() col.separator() + col.label(text="Screen:") + col.prop(view, "show_layout_ui") + col.prop(view, "show_splash") |