Commit: eeec0e3ae6f163ed5505e0715915aed63ba83ee2 Author: Bastien Montagne Date: Fri Apr 13 12:25:55 2018 +0200 Branches: asset-engine https://developer.blender.org/rBeeec0e3ae6f163ed5505e0715915aed63ba83ee2
Merge branch 'blender2.8' into asset-engine Conflicts: release/scripts/startup/bl_ui/space_filebrowser.py =================================================================== =================================================================== diff --cc release/scripts/startup/bl_ui/space_filebrowser.py index c67002e2f84,2d45d11b423..298b46f875b --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@@ -29,15 -29,12 +29,16 @@@ class FILEBROWSER_HT_header(Header) st = context.space_data params = st.params + is_lib_browser = params and params.use_library_browsing - layout.template_header() - layout.separator() + if st.active_operator is None: + layout.template_header() ++ layout.separator() - row = layout.row() - row.separator() + if is_lib_browser: + row = layout.row() + row.prop(st, "asset_engine_type", text="") + layout.separator() row = layout.row(align=True) row.operator("file.previous", text="", icon='BACK') _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs