[Bf-blender-cvs] [f44ffa50353] asset-engine: Merge branch 'id_override_static' into asset-engine

[Bastien Montagne]

Commit: f44ffa50353673163cca8d989ef65be78dac717e
Author: Bastien Montagne
Date:   Fri Sep 8 15:06:36 2017 +0200
Branches: asset-engine
https://developer.blender.org/rBf44ffa50353673163cca8d989ef65be78dac717e

Merge branch 'id_override_static' into asset-engine

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 9e6e2ff5b8e,f87d04fa0a3..0e4a2da7106
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1673,30 -1673,15 +1673,41 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
+ 		/* Fix for invalid state of screen due to bug in older versions. */
+ 		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
+ 			for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
+ 				if(sa->full && sc->state == SCREENNORMAL) {
+ 					sa->full = NULL;
+ 				}
+ 			}
+ 		}
+ 	}
++
++	{
 +		/* Move non-op filebrowsers to 'library browsing' type/mode. */
 +		for (bScreen *screen = main->screen.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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
  
  void do_versions_after_linking_270(Main *main)