Commit: 8374fe855e41f35403900b7fc4f9c59587124d0f
Author: Bastien Montagne
Date: Wed Feb 4 20:14:04 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB8374fe855e41f35403900b7fc4f9c59587124d0f
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 81e619b,096fc31..613ade6
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -532,30 -543,20 +546,47 @@@ void blo_do_versions_270(FileData *fd,
}
}
- {
- if (!DNA_struct_elem_find(fd->filesdna, "NodePlaneTrackDeformData",
"char", "flag")) {
- FOREACH_NODETREE(main, ntree, id) {
- if (ntree->type == NTREE_COMPOSIT) {
- bNode *node;
- for (node = ntree->nodes.first; node; node =
node->next) {
- if (ELEM(node->type,
CMP_NODE_PLANETRACKDEFORM)) {
- NodePlaneTrackDeformData *data
= node->storage;
- data->flag = 0;
- data->motion_blur_samples = 16;
- data->motion_blur_shutter =
0.5f;
++ if (!MAIN_VERSION_ATLEAST(main, 273, 6)) {
+ bScreen *scr;
+ ScrArea *sa;
+ SpaceLink *sl;
+ ARegion *ar;
+
+ for (scr = main->screen.first; scr; scr = scr->id.next) {
+ /* add new regions for filebrowser */
+ for (sa = scr->areabase.first; sa; sa = sa->next) {
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ if (sl->spacetype == SPACE_FILE) {
+ for (ar = sl->regionbase.first;
ar; ar = ar->next) {
+ if (ar->regiontype ==
RGN_TYPE_CHANNELS) {
+ break;
+ }
+ }
+
+ if (ar) {
+
BKE_area_region_free(NULL, ar);
+
BLI_freelinkN(&sl->regionbase, ar);
+ }
+ }
+ }
+ }
+ }
++
++ if (!DNA_struct_elem_find(fd->filesdna,
"NodePlaneTrackDeformData", "char", "flag")) {
++ FOREACH_NODETREE(main, ntree, id) {
++ if (ntree->type == NTREE_COMPOSIT) {
++ bNode *node;
++ for (node = ntree->nodes.first; node;
node = node->next) {
++ if (ELEM(node->type,
CMP_NODE_PLANETRACKDEFORM)) {
++
NodePlaneTrackDeformData *data = node->storage;
++ data->flag = 0;
++
data->motion_blur_samples = 16;
++
data->motion_blur_shutter = 0.5f;
++ }
+ }
+ }
+ }
++ FOREACH_NODETREE_END
+ }
- FOREACH_NODETREE_END
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
