[Bf-blender-cvs] [40dd7cb] asset-engine: Merge branch 'asset-experiments' into asset-engine
Bastien Montagne
noreply at git.blender.org
Sat May 2 15:25:50 CEST 2015
Commit: 40dd7cbe2155550665fdf657b591f8f1de645460
Author: Bastien Montagne
Date: Sat May 2 15:10:31 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB40dd7cbe2155550665fdf657b591f8f1de645460
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 7eb51e3,fad290a..7862126
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -43,58 -42,58 +43,62 @@@ class FILEBROWSER_HT_header(Header)
row = layout.row()
row.separator()
- row = layout.row(align=True)
- layout.operator_context = 'EXEC_DEFAULT'
- row.operator("file.directory_new", icon='NEWFOLDER')
+ if st.asset_engine:
+ draw_header = getattr(st.asset_engine, "draw_header", None)
+ if draw_header:
+ draw_header(row, context)
+ else:
+ row = layout.row(align=True)
+ layout.operator_context = 'EXEC_DEFAULT'
+ row.operator("file.directory_new", icon='NEWFOLDER')
+ 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, "display_type", expand=True, text="")
+ layout.prop(params, "display_type", expand=True, text="")
+
- if params.display_type == 'FILE_IMGDISPLAY':
- layout.prop(params, "thumbnail_size", text="")
++ if params.display_type == 'FILE_IMGDISPLAY':
++ 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, "recursion_level")
- layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
- layout.prop(params, "use_filter", text="", icon='FILTER')
+ layout.prop(params, "recursion_level")
+ 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.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 is_lib_browser:
- row.prop(params, "use_filter_blendid", text="")
- if (params.use_filter_blendid) :
- row.separator()
- row.prop(params, "filter_id", text="")
-
- row.separator()
- row.prop(params, "filter_search", text="", icon='VIEWZOOM')
+ row = layout.row(align=True)
+ row.active = params.use_filter
- layout.template_running_jobs()
+ 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 is_lib_browser:
+ row.prop(params, "use_filter_blendid", text="")
+ if (params.use_filter_blendid) :
+ row.separator()
+ row.prop(params, "filter_id", text="")
+
+ row.separator()
+ row.prop(params, "filter_search", text="", icon='VIEWZOOM')
+
+ layout.template_running_jobs()
class FILEBROWSER_UL_dir(bpy.types.UIList):
More information about the Bf-blender-cvs
mailing list