Commit: 81c56d15c7fc434786a25d7bcb8bdc941239ce5a
Author: Antony Riakiotakis
Date: Wed Feb 11 11:07:08 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB81c56d15c7fc434786a25d7bcb8bdc941239ce5a
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index d1de9e4,572566d..81c2776
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -562,24 -564,31 +564,53 @@@ 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;
+ if (!MAIN_VERSION_ATLEAST(main, 273, 7)) {
+ bScreen *scr;
+ ScrArea *sa;
+ SpaceLink *sl;
+ ARegion *ar;
+
+ for (scr = main->screen.first; scr; scr = scr->id.next) {
+ /* Remove old deprecated region from filebrowsers */
+ for (sa = scr->areabase.first; sa; sa = sa->next) {
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 (sl->spacetype == SPACE_FILE) {
+ for (ar = sl->regionbase.first;
ar; ar = ar->next) {
+ if (ar->regiontype ==
RGN_TYPE_CHANNELS) {
+ break;
+ }
+ }
+
+ if (ar) {
+ /* Free old deprecated
'channel' region... */
+
BKE_area_region_free(NULL, ar);
+
BLI_freelinkN(&sl->regionbase, ar);
+ }
}
+ }
+ }
+ }
+ }
+
++ if (!MAIN_VERSION_ATLEAST(main, 274, 0)) {
++ if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "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_NODE) {
++ SpaceNode *snode =
(SpaceNode *)sl;
++ snode->backdrop_zoom =
1.0;
++ }
++ if (sl->spacetype == SPACE_SEQ)
{
++ SpaceSeq *sseq =
(SpaceSeq *)sl;
++ sseq->overdrop_zoom =
1.0;
++ }
++ }
+ }
+ }
+ }
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
