[Bf-blender-cvs] [e66733a5bb7] workspaces: Merge branch 'blender2.8' into workspaces

[Bastien Montagne]

Commit: e66733a5bb7da492334b0d8d4a36ac823eb64daa
Author: Bastien Montagne
Date:   Sun May 28 18:00:41 2017 +0200
Branches: workspaces
https://developer.blender.org/rBe66733a5bb7da492334b0d8d4a36ac823eb64daa

Merge branch 'blender2.8' into workspaces

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 2c0b144d5b3,672f712d861..08d8334c9e5
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -42,8 -44,8 +44,9 @@@
  #include "BKE_idprop.h"
  #include "BKE_layer.h"
  #include "BKE_main.h"
+ #include "BKE_mesh.h"
  #include "BKE_scene.h"
 +#include "BKE_workspace.h"
  
  #include "BLI_listbase.h"
  #include "BLI_mempool.h"
diff --cc source/blender/editors/space_file/filesel.c
index 880b0b25e24,c2700233cf5..df0b2a34380
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -225,10 -225,10 +225,10 @@@ short ED_fileselect_set_params(SpaceFil
  		}
  		
  
 -		if (params->type == FILE_LOADLIB) {
 +		if (ELEM(params->type, FILE_LOADLIB_LINKABLE, FILE_LOADLIB_APPENDABLE)) {
  			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
  			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
- 			params->flag |= RNA_boolean_get(op->ptr, "active_layer") ? FILE_ACTIVELAY : 0;
+ 			params->flag |= RNA_boolean_get(op->ptr, "active_collection") ? FILE_ACTIVE_COLLECTION : 0;
  		}
  
  		if ((prop = RNA_struct_find_property(op->ptr, "display_type"))) {