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

[Sergey Sharybin]

Commit: 4c4673ce7f8db448696e76a825d2a38004ffb706
Author: Sergey Sharybin
Date:   Mon Apr 13 19:18:27 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB4c4673ce7f8db448696e76a825d2a38004ffb706

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index a9a608a,1b91d3d..154eea4
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -971,43 -799,4 +971,35 @@@ 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, 5)) {
- 		/* Particle random phase range doubled. */
- 		ParticleSettings *part;
- 		for (part = main->particle.first; part; part = part->id.next) {
- 			part->randphasefac *= 0.5f;
- 		}
- 	}
  }