[Bf-blender-cvs] [a20025b] soc-2016-multiview: Fix incorrect version check
Julian Eisel
noreply at git.blender.org
Sat Aug 13 01:22:17 CEST 2016
Commit: a20025b631803977ca1f93e1c331e3fce08981d1
Author: Julian Eisel
Date: Sat Aug 13 01:21:28 2016 +0200
Branches: soc-2016-multiview
https://developer.blender.org/rBa20025b631803977ca1f93e1c331e3fce08981d1
Fix incorrect version check
Was just always running.
===================================================================
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 3be8620..1a8af06 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1321,9 +1321,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
/* ------- end of grease pencil initialization --------------- */
+ }
+ {
/* initialize regiondata for each SpaceClip, due to the newly brought RegionSpaceClip */
- if (!DNA_struct_elem_find(fd->filesdna, "ARegion", "RegionSpaceClip", "regiondata")) {
+ 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) {
@@ -1333,6 +1335,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
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;
More information about the Bf-blender-cvs
mailing list