Commit: bb332043f0fb85bb9bcf3556b1f84f9dc1ebdb98
Author: Tianwei Shen
Date: Thu Mar 9 20:27:36 2017 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBbb332043f0fb85bb9bcf3556b1f84f9dc1ebdb98
Merge branch 'master' into soc-2016-multiview
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 610c74148eb,d3f33cf725f..8eb61251ddd
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1577,32 -1575,40 +1577,67 @@@ void blo_do_versions_270(FileData *fd,
}
}
+ /* Fix for T50736, Glare comp node using same var for two
different things. */
+ if (!DNA_struct_elem_find(fd->filesdna, "NodeGlare", "char",
"star_45")) {
+ 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_GLARE) {
+ NodeGlare *ndg =
node->storage;
+ switch (ndg->type) {
+ case 2: /*
Grrrr! magic numbers :( */
+
ndg->streaks = ndg->angle;
+ break;
+ case 0:
+
ndg->star_45 = ndg->angle != 0;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+ } FOREACH_NODETREE_END
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna,
"SurfaceDeformModifierData", "float", "mat[4][4]")) {
+ for (Object *ob = main->object.first; ob; ob =
ob->id.next) {
+ for (ModifierData *md = ob->modifiers.first;
md; md = md->next) {
+ if (md->type ==
eModifierType_SurfaceDeform) {
+ SurfaceDeformModifierData *smd
= (SurfaceDeformModifierData *)md;
+ unit_m4(smd->mat);
+ }
+ }
+ }
+ }
++
+ /* 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
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
