Commit: da631b72f986355d0bfe68d547fe8aff8d486a82
Author: Tianwei Shen
Date: Wed Sep 7 11:15:07 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBda631b72f986355d0bfe68d547fe8aff8d486a82
Merge branch 'master' into soc-2016-multiview
fix versioning_270.c conflict. Move secondary_clip version below 2.78
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 58f96e9,dfaa59c..4519c46
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1421,4 -1392,4 +1394,33 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
++
++ {
++ /* initialize regiondata for each SpaceClip, due to the newly
brought RegionSpaceClip */
++ if (!DNA_struct_elem_find(fd->filesdna, "SpaceClip",
"MovieClip", "*secondary_clip")) {
++ for (bScreen *screen = main->screen.first; screen !=
NULL; screen = screen->id.next) {
++ for (ScrArea *sa = screen->areabase.first; sa
!= NULL; sa = sa->next) {
++ for (SpaceLink *sl =
sa->spacedata.first; sl != NULL; sl = sl->next) {
++ if (sl->spacetype ==
SPACE_CLIP) {
++ ListBase *regionbase =
(sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
++ for (ARegion *ar =
regionbase->first; ar != NULL; ar = ar->next) {
++ if
(ar->regiontype == RGN_TYPE_WINDOW) {
++
SpaceClip *sc = (SpaceClip *)sl;
++
RegionSpaceClip *rsc = MEM_callocN(sizeof(RegionSpaceClip), "region data for
clip");
++
++
rsc->xof = sc->xof;
++
rsc->yof = sc->yof;
++
rsc->xlockof = sc->xlockof;
++
rsc->ylockof = sc->ylockof;
++
rsc->zoom = sc->zoom;
++
rsc->flag = RSC_MAIN_CLIP;
++
ar->regiondata = rsc;
++ }
++ }
++ }
++ }
++ }
++ }
++ }
++ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
