[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38502] trunk/blender/source/blender: cleanup of scene->gamedata DNA

Dalai Felinto dfelinto at gmail.com
Tue Jul 19 04:47:44 CEST 2011


Revision: 38502
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38502
Author:   dfelinto
Date:     2011-07-19 02:47:43 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
cleanup of scene->gamedata DNA

xsch and ysch were originally planed to replace the scene->r.xsch/r.ysch
however in blender/3dview we still need to use the r. values. Therefore we can't really run
from using those values even in bplayer. So removed the values in gamedata.

The way it's now, render values (xsch and ysch) are responsible for aspect ratio and gamedata xplay and yplay are responsible for the size of the window.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-07-19 01:41:45 UTC (rev 38501)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-07-19 02:47:43 UTC (rev 38502)
@@ -10281,8 +10281,6 @@
 			sce->gm.attrib = sce->r.attrib;
 
 			//Stereo
-			sce->gm.xsch = sce->r.xsch;
-			sce->gm.ysch = sce->r.ysch;
 			sce->gm.stereomode = sce->r.stereomode;
 			/* reassigning stereomode NO_STEREO and DOME to a separeted flag*/
 			if (sce->gm.stereomode == 1){ //1 = STEREO_NOSTEREO

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-07-19 01:41:45 UTC (rev 38501)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-07-19 02:47:43 UTC (rev 38502)
@@ -430,7 +430,8 @@
 	/*
 	 * Radius of the activity bubble, in Manhattan length. Objects
 	 * outside the box are activity-culled. */
-	float activityBoxRadius; //it's not being used ANYWHERE !!!!!!!!!!!!!!
+	float activityBoxRadius;
+
 	/*
 	 * bit 3: (gameengine): Activity culling is enabled.
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
@@ -447,7 +448,8 @@
 
 	/* stereo/dome mode */
 	struct GameDome dome;
-	short stereoflag, stereomode, xsch, ysch; //xsch and ysch used for backwards compat.
+	short stereoflag, stereomode;
+	short pad2, pad3;
 	float eyeseparation, pad1;
 } GameData;
 




More information about the Bf-blender-cvs mailing list