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

[Bastien Montagne]

Commit: b1a15bc54ec618b715b8c771a0bb40500a7e475c
Author: Bastien Montagne
Date:   Wed Apr 17 12:30:39 2019 +0200
Branches: asset-engine
https://developer.blender.org/rBb1a15bc54ec618b715b8c771a0bb40500a7e475c

Merge 'master' into 'asset-engine'

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index da07f3e42b3,528bfd2360f..384f0c28ca3
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3141,41 -3140,23 +3141,58 @@@ void blo_do_versions_280(FileData *fd, 
  	}
  
  	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "bSplineIKConstraint", "short", "yScaleMode")) {
+ 			for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
+ 				if (ob->pose) {
+ 					for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						for (bConstraint *con = pchan->constraints.first; con; con = con->next) {
+ 							if (con->type == CONSTRAINT_TYPE_SPLINEIK) {
+ 								bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
+ 								if ((data->flag & CONSTRAINT_SPLINEIK_SCALE_LIMITED) == 0) {
+ 									data->yScaleMode = CONSTRAINT_SPLINEIK_YS_FIT_CURVE;
+ 								}
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
  		/* 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->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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
 +
 +
 +
 +
  }