[Bf-blender-cvs] [04d9e28] gooseberry: Merge branch 'master' into gooseberry
Antony Riakiotakis
noreply at git.blender.org
Mon Apr 13 14:33:33 CEST 2015
Commit: 04d9e286211e1d958ba84f201181d60d35a29755
Author: Antony Riakiotakis
Date: Mon Apr 13 14:31:36 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB04d9e286211e1d958ba84f201181d60d35a29755
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 154eea4,49e81b1..a9a608a
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -972,34 -800,11 +972,42 @@@ 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;
+ }
+ }
}
More information about the Bf-blender-cvs
mailing list