BGE patch: new Physics button and margin parameter in Logic panel. Change subversion.

[blender-staging.git] / source / blender / blenloader / intern / readfile.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index da85a264a0cdce80ccb366a039692c4b9c4a9be5..fc863ff2f5e2d83aebf3df7486b06f733a269e79 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7769,7 +7769,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        alphasort_version_246(fd, lib, me);
        }
        
-       if(main->versionfile <= 246 && main->subversionfile < 1){
+       if(main->versionfile < 246 || (main->versionfile == 246 && main->subversionfile < 1)){
                Object *ob;
                for(ob = main->object.first; ob; ob= ob->id.next) {
                        if(ob->pd && (ob->pd->forcefield == PFIELD_WIND))
@@ -7777,6 +7777,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                }
        }
 
+       if (main->versionfile < 247 || (main->versionfile == 247 && main->subversionfile < 2)){
+               Object *ob;
+               for(ob = main->object.first; ob; ob= ob->id.next) {
+                       ob->gameflag |= OB_PHYSICS;
+                       ob->margin = 0.06;
+               }
+       }
+
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */