[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40790] trunk/blender/source/blender/ makesdna/DNA_scene_types.h: bge bugfix: navmesh collision flag disputing with glsl_color_manag.

Dalai Felinto dfelinto at gmail.com
Tue Oct 4 20:15:28 CEST 2011


Revision: 40790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40790
Author:   dfelinto
Date:     2011-10-04 18:15:28 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
bge bugfix: navmesh collision flag disputing with glsl_color_manag.
The solution is to make the flag in to an int in oppose to short.
This will also help in cucumber where we ran into the same problem.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-10-04 17:04:35 UTC (rev 40789)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-10-04 18:15:28 UTC (rev 40790)
@@ -470,7 +470,8 @@
 	 * bit 3: (gameengine): Activity culling is enabled.
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
 	*/
-	short mode, flag, matmode, pad[2];
+	int flag;
+	short mode, matmode, pad;
 	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
 	short physicsEngine;
 	short ticrate, maxlogicstep, physubstep, maxphystep;
@@ -520,9 +521,9 @@
 #define GAME_IGNORE_DEPRECATION_WARNINGS	(1 << 12)
 #define GAME_ENABLE_ANIMATION_RECORD		(1 << 13)
 #define GAME_SHOW_MOUSE						(1 << 14)
-#define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 15)
 #define GAME_GLSL_NO_COLOR_MANAGEMENT		(1 << 15)
-/* Note: GameData.flag is a short (max 16 flags). To add more flags, GameData.flag needs to be an int */
+#define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 16)
+/* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */
 
 /* GameData.matmode */
 #define GAME_MAT_TEXFACE	0




More information about the Bf-blender-cvs mailing list