Commit: ca04eef4f2ecc91689c74a53aa933164e1f5cf9c
Author: Bastien Montagne
Date: Wed Feb 11 00:29:31 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBca04eef4f2ecc91689c74a53aa933164e1f5cf9c
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 97331e9,572566d..83aa187
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -570,6 -485,6 +572,26 @@@ void blo_do_versions_270(FileData *fd,
}
}
++ if (!MAIN_VERSION_ATLEAST(main, 273, 4)) {
++ 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_NODE) {
++ SpaceNode *snode = (SpaceNode
*)sl;
++ snode->backdrop_zoom = 1.0;
++ }
++ if (sl->spacetype == SPACE_SEQ) {
++ SpaceSeq *sseq = (SpaceSeq *)sl;
++ sseq->overdrop_zoom = 1.0;
++ }
++ }
++ }
++ }
++ }
++
if (!MAIN_VERSION_ATLEAST(main, 273, 6)) {
if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings",
"float", "bending_damping")) {
Object *ob;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
