[Bf-blender-cvs] [80acaa3] asset-engine: Merge branch 'asset-experiments' into asset-engine
Bastien Montagne
noreply at git.blender.org
Sat Jul 4 13:16:51 CEST 2015
Commit: 80acaa3009665f21e51494f121b3b43c13f4458e
Author: Bastien Montagne
Date: Sat Jul 4 13:16:30 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB80acaa3009665f21e51494f121b3b43c13f4458e
Merge branch 'asset-experiments' into asset-engine
Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_filebrowser.py
index f47a01b,0b9c847..9a4186a
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -41,60 -40,56 +41,60 @@@ class FILEBROWSER_HT_header(Header)
row.operator("file.parent", text="", icon='FILE_PARENT')
row.operator("file.refresh", text="", icon='FILE_REFRESH')
- layout.separator()
- layout.operator_context = 'EXEC_DEFAULT'
- layout.operator("file.directory_new", icon='NEWFOLDER', text="")
- layout.separator()
+ if st.asset_engine:
+ draw_header = getattr(st.asset_engine, "draw_header", None)
+ if draw_header:
+ draw_header(layout, context)
+ else:
+ layout.operator_context = 'EXEC_DEFAULT'
+ layout.operator("file.directory_new", icon='NEWFOLDER', text="")
+ layout.separator()
+ layout.operator_context = 'INVOKE_DEFAULT'
- layout.operator_context = 'INVOKE_DEFAULT'
- params = st.params
+ params = st.params
- # can be None when save/reload with a file selector open
- if params:
- is_lib_browser = params.use_library_browsing
+ # can be None when save/reload with a file selector open
+ if params:
+ is_lib_browser = params.use_library_browsing
- layout.prop(params, "recursion_level", text="")
+ layout.prop(params, "recursion_level", text="")
- layout.prop(params, "display_type", expand=True, text="")
+ layout.prop(params, "display_type", expand=True, text="")
- layout.prop(params, "thumbnail_size", text="")
+ layout.prop(params, "thumbnail_size", text="")
- layout.prop(params, "sort_method", expand=True, text="")
+ layout.prop(params, "sort_method", expand=True, text="")
- layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
- layout.prop(params, "use_filter", text="", icon='FILTER')
+ layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
+ layout.prop(params, "use_filter", text="", icon='FILTER')
- row = layout.row(align=True)
- row.active = params.use_filter
+ row = layout.row(align=True)
+ row.active = params.use_filter
- row.prop(params, "use_filter_folder", text="")
+ row.prop(params, "use_filter_folder", text="")
- if params.filter_glob:
- #if st.active_operator and hasattr(st.active_operator, "filter_glob"):
- # row.prop(params, "filter_glob", text="")
- row.label(params.filter_glob)
- else:
- row.prop(params, "use_filter_blender", text="")
- row.prop(params, "use_filter_backup", text="")
- row.prop(params, "use_filter_image", text="")
- row.prop(params, "use_filter_movie", text="")
- row.prop(params, "use_filter_script", text="")
- row.prop(params, "use_filter_font", text="")
- row.prop(params, "use_filter_sound", text="")
- row.prop(params, "use_filter_text", text="")
+ if params.filter_glob:
+ #if st.active_operator and hasattr(st.active_operator, "filter_glob"):
+ # row.prop(params, "filter_glob", text="")
+ row.label(params.filter_glob)
+ else:
+ row.prop(params, "use_filter_blender", text="")
+ row.prop(params, "use_filter_backup", text="")
+ row.prop(params, "use_filter_image", text="")
+ row.prop(params, "use_filter_movie", text="")
+ row.prop(params, "use_filter_script", text="")
+ row.prop(params, "use_filter_font", text="")
+ row.prop(params, "use_filter_sound", text="")
+ row.prop(params, "use_filter_text", text="")
- if is_lib_browser:
- row.prop(params, "use_filter_blendid", text="")
- if params.use_filter_blendid:
- row.separator()
- row.prop(params, "filter_id_category", text="")
+ if is_lib_browser:
+ row.prop(params, "use_filter_blendid", text="")
+ if params.use_filter_blendid:
+ row.separator()
- row.prop(params, "filter_id", text="")
++ row.prop(params, "filter_id_category", text="")
- row.separator()
- row.prop(params, "filter_search", text="", icon='VIEWZOOM')
+ row.separator()
+ row.prop(params, "filter_search", text="", icon='VIEWZOOM')
layout.template_running_jobs()
More information about the Bf-blender-cvs
mailing list