[Bf-blender-cvs] [a8cdd9d] gooseberry: Merge branch 'master' into gooseberry

[Lukas Tönne]

Commit: a8cdd9dda72e20bcac7c16d236abd4d98e65147f
Author: Lukas Tönne
Date:   Wed Apr 29 21:41:02 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBa8cdd9dda72e20bcac7c16d236abd4d98e65147f

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index f2f4b65,2343ba0..44cc6b1
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -972,34 -800,27 +972,58 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
 +	if (!DNA_struct_elem_find(fd->filesdna, "SmokeDomainSettings", "float", "display_thickness")) {
 +		Object *ob;
 +		ModifierData *md;
 +		for (ob = main->object.first; ob; ob = ob->id.next) {
 +			for (md = ob->modifiers.first; md; md = md->next) {
 +				if (md->type == eModifierType_Smoke) {
 +					SmokeModifierData *smd = (SmokeModifierData *)md;
 +					if (smd->domain) {
 +						smd->domain->display_thickness = 1.0f;
 +					}
 +				}
 +			}
 +		}
 +	}
 +	if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", "backdrop_zoom")) {
 +		bScreen *sc;
 +		for (sc = main->screen.first; sc; sc = sc->id.next) {
 +			ScrArea *sa;
 +			for (sa = sc->areabase.first; sa; sa = sa->next) {
 +				SpaceLink *sl;
 +				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +					if (sl->spacetype == SPACE_IPO) {
 +						SpaceIpo *sipo = (SpaceIpo *)sl;
 +						sipo->backdrop_zoom = 1.0f;
 +						sipo->backdrop_opacity = 0.7f;
 +					}
 +				}
 +			}
 +		}
 +	}
++
+ 	if (!MAIN_VERSION_ATLEAST(main, 274, 6)) {
+ 		bScreen *screen;
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnails_size")) {
+ 			for (screen = main->screen.first; screen; screen = screen->id.next) {
+ 				ScrArea *sa;
+ 
+ 				for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						if (sl->spacetype == SPACE_FILE) {
+ 							SpaceFile *sfile = (SpaceFile *)sl;
+ 
+ 							if (sfile->params) {
+ 								sfile->params->thumbnails_size = 128;
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
  }