Commit: d4effd9e7b5bf920c607e490eaaaa930c22b3996
Author: Bastien Montagne
Date: Fri Feb 9 14:43:01 2018 +0100
Branches: asset-engine
https://developer.blender.org/rBd4effd9e7b5bf920c607e490eaaaa930c22b3996
Merge branch 'blender2.8' into asset-engine
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_info.py
index 638733c767f,8c69e733a2d..cf374435d61
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@@ -86,17 -83,8 +83,17 @@@ class INFO_HT_header(Header)
row.label(bpy.app.autoexec_fail_message)
return
+ if (bpy.app.assets_fail or bpy.app.assets_need_reload) and not
bpy.app.assets_quiet:
+ row.operator("script.assets_warn_clear", text="Ignore")
+ if bpy.app.assets_need_reload is True and bpy.app.assets_quiet is
False:
+ row.operator("wm.assets_reload", icon='SCREEN_BACK',
text="Reload Assets")
+ row.label("Some assets have to be reloaded", icon='INFO')
+ if bpy.app.assets_fail is True and bpy.app.assets_quiet is False:
+ row.label("Some asset engine(s) failed to retrieve updated
data about their assets...", icon='ERROR')
+ return
+
row.operator("wm.splash", text="", icon='BLENDER', emboss=False)
- row.label(text=scene.statistics(context.view_layer), translate=False)
+ row.label(text=scene.statistics(workspace, context.view_layer),
translate=False)
class INFO_MT_editor_menus(Menu):
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
