[Bf-blender-cvs] [2491a8e4160] asset-engine: Merge branch 'blender2.8' into asset-engine

[Bastien Montagne]

Commit: 2491a8e4160d82324717077aeda25eed25459948
Author: Bastien Montagne
Date:   Sun Jan 28 17:50:38 2018 +0100
Branches: asset-engine
https://developer.blender.org/rB2491a8e4160d82324717077aeda25eed25459948

Merge branch 'blender2.8' into asset-engine

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index f7c71350b50,2f07ca43ff0..ac0d5f225cb
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -914,31 -914,13 +914,39 @@@ void blo_do_versions_280(FileData *fd, 
  				}
  			}
  		}
 +
 +		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 = 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;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
+ 
+ 	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "LightProbe", "float", "intensity")) {
+ 			for (LightProbe *probe = main->lightprobe.first; probe; probe = probe->id.next) {
+ 				probe->intensity = 1.0f;
+ 			}
+ 		}
+ 	}
  }