diff options
author | Jacques Lucke <jacques@blender.org> | 2020-10-28 22:21:52 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-10-28 22:21:52 +0300 |
commit | 79c9c11b355833b9cbb33048cf305de687e817f6 (patch) | |
tree | 7ff2691f11bcc03cbf5b2dd961c03486888a16a7 /release | |
parent | e1d0ab2dbcf4466026f9565ef0c34f940fcc220e (diff) | |
parent | d32188b85bf031f316bf0ae284805c5934fdee9c (diff) |
Merge branch 'master' into geometry-nodes
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/file.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py index 43fbd381cb2..78a7ead71ca 100644 --- a/release/scripts/startup/bl_operators/file.py +++ b/release/scripts/startup/bl_operators/file.py @@ -77,7 +77,7 @@ class WM_OT_previews_batch_generate(Operator): ) use_intern_data: BoolProperty( default=True, - name="Mat/Tex/...", + name="Materials & Textures", description="Generate 'internal' previews (materials, textures, images, etc.)", ) @@ -187,7 +187,7 @@ class WM_OT_previews_batch_clear(Operator): ) use_intern_data: BoolProperty( default=True, - name="Mat/Tex/...", + name="Materials & Textures", description="Clear 'internal' previews (materials, textures, images, etc.)", ) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 6fc29119cdc..a7e28c38b9e 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -248,7 +248,7 @@ class TOPBAR_MT_file_cleanup(Menu): layout = self.layout layout.separator() - layout.operator("outliner.orphans_purge") + layout.operator("outliner.orphans_purge", text="Unused Data-Blocks") class TOPBAR_MT_file(Menu): diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 798f5363f9d..1707c21c164 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -271,7 +271,7 @@ class USERPREF_PT_interface_editors(InterfacePanel, CenterAlignMixIn, Panel): class USERPREF_PT_interface_temporary_windows(InterfacePanel, CenterAlignMixIn, Panel): - bl_label = "Temporary Windows" + bl_label = "Temporary Editors" bl_parent_id = "USERPREF_PT_interface_editors" bl_options = {'DEFAULT_CLOSED'} |