diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:41:38 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:41:38 +0400 |
commit | c557f6f0b64b0ca7ec1cb3f17e2b40bc76e4368a (patch) | |
tree | 0b65c9ee9d4d43d8a5be1b81445493e38dda230b | |
parent | b6bb65cd21c6f0abe37d9578bbd8da49d45e7466 (diff) |
Subversion bump for render tiles, motion tracking fallback option and collisions.
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index fbdbf052878..87e87904fe7 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -42,7 +42,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 264 -#define BLENDER_SUBVERSION 6 +#define BLENDER_SUBVERSION 7 /* 262 was the last editmesh release but it has compatibility code for bmesh data */ #define BLENDER_MINVERSION 262 diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 38e92961075..2ea3fb75709 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8299,7 +8299,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } - { + if (main->versionfile < 264 || (main->versionfile == 264 && main->subversionfile < 7)) { /* convert tiles size from resolution and number of tiles */ { Scene *scene; @@ -8314,19 +8314,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - } - - { - Object *ob; - for (ob = main->object.first; ob; ob = ob->id.next) { - if (ob->col_group == 0) { - ob->col_group = 0x01; - ob->col_mask = 0xff; + + /* collision masks */ + { + Object *ob; + for (ob = main->object.first; ob; ob = ob->id.next) { + if (ob->col_group == 0) { + ob->col_group = 0x01; + ob->col_mask = 0xff; + } } } - } - { /* fallbck resection method settings */ { MovieClip *clip; |