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

Bastien Montagne noreply at git.blender.org
Tue Feb 19 10:50:54 CET 2019


Commit: edce196beb78d41d904a0eea40cb0c9fc1393bfe
Author: Bastien Montagne
Date:   Tue Feb 19 10:33:03 2019 +0100
Branches: asset-engine
https://developer.blender.org/rBedce196beb78d41d904a0eea40cb0c9fc1393bfe

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 36262c809b9,9cb63e773cd..20e5e6fddcf
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2815,43 -2798,20 +2799,55 @@@ void blo_do_versions_280(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 45)) {
+ 		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+ 			for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+ 				for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
+ 					if (sl->spacetype == SPACE_SEQ) {
+ 						SpaceSeq *sseq = (SpaceSeq *)sl;
+ 						sseq->flag |= SEQ_SHOW_MARKER_LINES;
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
+ 
  	{
  		/* Versioning code until next subversion bump goes here. */
- 
  	}
 +
 +
 +
 +
 +
 +
 +	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->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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
 +
 +
 +
 +
  }
diff --cc source/blender/editors/space_script/script_edit.c
index e54481e5944,4b5cd6b7166..60a2f0f757f
--- a/source/blender/editors/space_script/script_edit.c
+++ b/source/blender/editors/space_script/script_edit.c
@@@ -25,9 -26,9 +26,10 @@@
  #include <stdio.h>
  
  #include "BLI_utildefines.h"
+ #include "BLI_listbase.h"
  
  #include "BKE_context.h"
 +#include "BKE_global.h"
  #include "BKE_report.h"
  
  #include "WM_api.h"



More information about the Bf-blender-cvs mailing list