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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-13 04:05:49 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-13 04:05:49 +0300
commitcdc31c3e6e953b8e10c757db113b7a60f701e1dd (patch)
tree6bb85293faf6b7ab7ad7e8d169106584590fbc94 /release
parent49d51a1e6246f00233abf54a8b24b5d829848e44 (diff)
parent40dbf2fc0000f2905d436fc28b93a9b97431f72d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 1089b5c699d..849f678b5c3 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -315,13 +315,15 @@ class USERPREF_PT_interface(Panel):
sub.prop(view, "pie_menu_threshold")
sub.prop(view, "pie_menu_confirm")
col.separator()
- col.separator()
+
+ col.prop(view, "show_splash")
col.separator()
- col.label(text="Screen:")
+ col.label(text="App Template:")
+ col.label(text="Options intended for use with app-templates only.")
col.prop(view, "show_layout_ui")
+ col.prop(view, "show_view3d_cursor")
- col.prop(view, "show_splash")
class USERPREF_PT_edit(Panel):