[Bf-blender-cvs] [f398eb06680] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: f398eb066802f7b4e726aeafc6d7b17a9d6e537a
Author: Bastien Montagne
Date:   Mon Aug 19 19:14:10 2019 +0200
Branches: asset-engine
https://developer.blender.org/rBf398eb066802f7b4e726aeafc6d7b17a9d6e537a

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenkernel/intern/library.c

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_info.py
index 44414cb3cc5,eabf71365d5..49f094f2275
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@@ -27,21 -27,56 +27,67 @@@ class INFO_HT_header(Header)
          layout = self.layout
          layout.template_header()
  
-         # Empty for now until info editor gets turned into log editor
+         INFO_MT_editor_menus.draw_collapsible(context, layout)
+ 
+ 
+ class INFO_MT_editor_menus(Menu):
+     bl_idname = "INFO_MT_editor_menus"
+     bl_label = ""
+ 
+     def draw(self, context):
+         layout = self.layout
+         layout.menu("INFO_MT_view")
+         layout.menu("INFO_MT_info")
+ 
+ 
+ class INFO_MT_view(Menu):
+     bl_label = "View"
+ 
+     def draw(self, context):
+         layout = self.layout
+ 
+         layout.menu("INFO_MT_area")
+ 
+ 
+ class INFO_MT_info(Menu):
+     bl_label = "Info"
+ 
+     def draw(self, context):
+         layout = self.layout
+ 
+         layout.operator("info.select_all", text="Select All").action = 'SELECT'
+         layout.operator("info.select_all", text="Deselect All").action = 'DESELECT'
+         layout.operator("info.select_all", text="Invert Selection").action = 'INVERT'
+         layout.operator("info.select_all", text="Toggle Selection").action = 'TOGGLE'
+ 
+         layout.separator()
+ 
+         layout.operator("info.select_box")
+ 
+         layout.separator()
+ 
+         # Disabled because users will likely try this and find
+         # it doesn't work all that well in practice.
+         # Mainly because operators needs to run in the right context.
+ 
+         # layout.operator("info.report_replay")
+         # layout.separator()
+ 
+         layout.operator("info.report_delete", text="Delete")
+         layout.operator("info.report_copy", text="Copy")
  
 +"""
 +        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
 +"""
 +
  
- # Not really info, just add to re-usable location.
  class INFO_MT_area(Menu):
      bl_label = "Area"
  
diff --cc source/blender/blenloader/intern/versioning_280.c
index 3e5ddd5b47f,149b02e7761..b0fa3e1ef0d
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3569,35 -3687,10 +3688,40 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
+     for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) {
+       if (mesh->remesh_voxel_size == 0.0f) {
+         mesh->remesh_voxel_size = 0.1f;
+       }
+     }
    }
 +
 +  if (1 ||
 +      !DNA_struct_find(fd->filesdna,
 +                       "AssetUUID")) { /* struct_find will have to wait, not working for now... */
 +    /* Move non-op filebrowsers to 'library browsing' type/mode. */
 +    for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +      for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +        for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +          if (sl->spacetype == SPACE_FILE) {
 +            SpaceFile *sfile = (SpaceFile *)sl;
 +            if (sfile->params != NULL) {
 +              sfile->params->type = FILE_LOADLIB;
 +              sfile->params->filter = FILE_TYPE_FOLDER | FILE_TYPE_BLENDERLIB;
 +              /* For now, always init filterid to 'all true' */
 +              sfile->params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR |
 +                                         FILTER_ID_CA | FILTER_ID_CU | FILTER_ID_GD |
 +                                         FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA |
 +                                         FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
 +                                         FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME |
 +                                         FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
 +                                         FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC |
 +                                         FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
 +                                         FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF |
 +                                         FILTER_ID_WO | FILTER_ID_CF;
 +            }
 +          }
 +        }
 +      }
 +    }
 +  }
  }