[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51890] trunk/blender/source/blender: Subversion bump for render tiles, motion tracking fallback option and collisions.

[Sergey Sharybin]

Revision: 51890
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51890
Author:   nazgul
Date:     2012-11-05 08:41:38 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Subversion bump for render tiles, motion tracking fallback option and collisions.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-11-05 08:19:58 UTC (rev 51889)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-11-05 08:41:38 UTC (rev 51890)
@@ -42,7 +42,7 @@
  * 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

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-11-05 08:19:58 UTC (rev 51889)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-11-05 08:41:38 UTC (rev 51890)
@@ -8299,7 +8299,7 @@
 		}
 	}
 
-	{
+	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 @@
 				}
 			}
 		}
-	}
-	
-	{
-		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;