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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-04-13 13:19:31 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-04-13 13:19:31 +0300
commit07fc6c922493bf0f6252da663e9854b8c9d95b8b (patch)
tree9823b72f6933d323028ba8157e90c7b6db009687 /release
parent199715eabccce8d91cd4f9705762305e8f236b8c (diff)
parent332846b188d6c7463758fb8d8659785beccde63a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_filebrowser.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index bd72dfa9370..2d45d11b423 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -28,8 +28,10 @@ class FILEBROWSER_HT_header(Header):
layout = self.layout
st = context.space_data
+ params = st.params
- layout.template_header()
+ if st.active_operator is None:
+ layout.template_header()
row = layout.row()
row.separator()
@@ -46,7 +48,6 @@ class FILEBROWSER_HT_header(Header):
layout.separator()
layout.operator_context = 'INVOKE_DEFAULT'
- params = st.params
# can be None when save/reload with a file selector open
if params: