Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Subversion bump for render tiles, motion tracking fallback option and collisions.

Browse Source
This commit is contained in:
Sergey Sharybin
2012-11-05 08:41:38 +00:00
parent b6bb65cd21
commit c557f6f0b6
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@@ -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

21
source/blender/blenloader/intern/readfile.c
View File

@@ -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;