Ignoring BGE world setting from previously files.
authorDalai Felinto <dfelinto@gmail.com>
Mon, 3 Aug 2009 14:56:46 +0000 (14:56 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 3 Aug 2009 14:56:46 +0000 (14:56 +0000)
* That also means you can't really change them and save it before we actually do a do_version.
* Marking the old variables in DNA_world_types.h to be removed.

source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_world_types.h

index 8dde100dff2298e048f4613cbe5366d900886772..28694233331b56de7dca4a6b5738077a6f3a2f2e 100644 (file)
@@ -9429,28 +9429,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        sce->gm.depth= sce->r.depth;
 
                        //Physic (previously stored in world)
-                       //temporarily getting the correct world address
-                       wo = newlibadr(fd, sce->id.lib, sce->world);
-                       if (wo){
-                               sce->gm.gravity = wo->gravity;
-                               sce->gm.physicsEngine= wo->physicsEngine;
-                               sce->gm.mode = wo->mode;
-                               sce->gm.occlusionRes = wo->occlusionRes;
-                               sce->gm.ticrate = wo->ticrate;
-                               sce->gm.maxlogicstep = wo->maxlogicstep;
-                               sce->gm.physubstep = wo->physubstep;
-                               sce->gm.maxphystep = wo->maxphystep;
-                       }
-                       else{
-                               sce->gm.gravity =9.8f;
-                               sce->gm.physicsEngine= WOPHY_BULLET;// Bullet by default
-                               sce->gm.mode = WO_DBVT_CULLING; // DBVT culling by default
-                               sce->gm.occlusionRes = 128;
-                               sce->gm.ticrate = 60;
-                               sce->gm.maxlogicstep = 5;
-                               sce->gm.physubstep = 1;
-                               sce->gm.maxphystep = 5;
-                       }
+                       sce->gm.gravity =9.8f;
+                       sce->gm.physicsEngine= WOPHY_BULLET;// Bullet by default
+                       sce->gm.mode = WO_DBVT_CULLING; // DBVT culling by default
+                       sce->gm.occlusionRes = 128;
+                       sce->gm.ticrate = 60;
+                       sce->gm.maxlogicstep = 5;
+                       sce->gm.physubstep = 1;
+                       sce->gm.maxphystep = 5;
                }
        }
 
index 200ff6d9324dd4984b2e7cfb0b91d69699878dc0..64ff23dd1a888dcf2525d9bc0f8a81bf0d7a3d33 100644 (file)
@@ -71,12 +71,12 @@ typedef struct World {
        /**
         * Gravitation constant for the game world
         */
-       float gravity; // moved to scene->gamedata in 2.5
+       float gravity; // XXX moved to scene->gamedata in 2.5
 
        /**
         * Radius of the activity bubble, in Manhattan length. Objects
         * outside the box are activity-culled. */
-       float activityBoxRadius; // moved to scene->gamedata in 2.5
+       float activityBoxRadius; // XXX moved to scene->gamedata in 2.5
        
        short skytype;
        /**
@@ -89,9 +89,9 @@ typedef struct World {
         * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling 
         */
        short mode;                                                                                             // partially moved to scene->gamedata in 2.5
-       short occlusionRes;             /* resolution of occlusion Z buffer in pixel */ // moved to scene->gamedata in 2.5
-       short physicsEngine;    /* here it's aligned */                                 // moved to scene->gamedata in 2.5
-       short ticrate, maxlogicstep, physubstep, maxphystep;    // moved to scene->gamedata in 2.5
+       short occlusionRes;             /* resolution of occlusion Z buffer in pixel */ // XXX moved to scene->gamedata in 2.5
+       short physicsEngine;    /* here it's aligned */                                 // XXX moved to scene->gamedata in 2.5
+       short ticrate, maxlogicstep, physubstep, maxphystep;    // XXX moved to scene->gamedata in 2.5
        
        float misi, miststa, mistdist, misthi;