Commit: 52811b3fb7e65e533e1cb0fd53945aefa3068b85
Author: Tianwei Shen
Date: Sun Jan 29 21:58:01 2017 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB52811b3fb7e65e533e1cb0fd53945aefa3068b85
Merge branch 'master' into soc-2016-multiview
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 829195eace,6235ebf28e..610c74148e
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1494,31 -1575,22 +1577,48 @@@ 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;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
}
+
+ void do_versions_after_linking_270(Main *main)
+ {
+ /* To be added to next subversion bump! */
+ {
+ FOREACH_NODETREE(main, ntree, id) {
+ if (ntree->type == NTREE_COMPOSIT) {
+ ntreeSetTypes(NULL, ntree);
+ for (bNode *node = ntree->nodes.first; node;
node = node->next) {
+ if (node->type == CMP_NODE_HUE_SAT) {
+ do_version_hue_sat_node(ntree,
node);
+ }
+ }
+ }
+ } FOREACH_NODETREE_END
+ }
+ }
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
