[Bf-blender-cvs] [65ffe0f] soc-2014-bge: Merge remote-tracking branch 'origin/master' into soc-2014-bge

Ines Almeida noreply at git.blender.org
Tue Aug 19 05:00:12 CEST 2014


Commit: 65ffe0f541128c2db0745f8a30947dc354195b82
Author: Ines Almeida
Date:   Mon Aug 18 23:43:30 2014 +0200
Branches: soc-2014-bge
https://developer.blender.org/rB65ffe0f541128c2db0745f8a30947dc354195b82

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Conflicts:
	source/gameengine/Ketsji/KX_PythonInit.cpp

===================================================================



===================================================================

diff --cc source/gameengine/Ketsji/KX_PythonInit.cpp
index a659867c,da8a0c0..a1f601b
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@@ -251,13 -257,13 +260,13 @@@ static PyObject *gPyExpandPath(PyObjec
  
  	BLI_strncpy(expanded, filename, FILE_MAX);
  	BLI_path_abs(expanded, gp_GamePythonPath);
- 	return PyUnicode_DecodeFSDefault(expanded);
+ 	return PyC_UnicodeFromByte(expanded);
  }
  
 -static char gPyStartGame_doc[] =
 -"startGame(blend)\n\
 -Loads the blend file";
 -
 +PyDoc_STRVAR(gPyStartGame_doc,
 +	"startGame(blend)\n"
 +	"Loads the blend file"
 +);
  static PyObject *gPyStartGame(PyObject *, PyObject *args)
  {
  	char* blendfile;
@@@ -2277,11 -2271,14 +2286,10 @@@ static struct PyModuleDef Rasterizer_mo
  	0,  /* m_free */
  };
  
 -PyObject *initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas)
 +PyMODINIT_FUNC initRasterizerPythonBinding()
  {
 -	gp_Canvas = canvas;
 -	gp_Rasterizer = rasty;
 -
 -
  	PyObject *m;
  	PyObject *d;
- 	PyObject *item;
  
  	/* Use existing module where possible
  	 * be careful not to init any runtime vars after this */
@@@ -2414,8 -2408,7 +2422,7 @@@ PyMODINIT_FUNC initGameKeysPythonBindin
  {
  	PyObject *m;
  	PyObject *d;
- 	PyObject *item;
 -	
 +
  	/* Use existing module where possible */
  	m = PyImport_ImportModule( "GameKeys" );
  	if (m) {
diff --cc source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index dd39b55,ff8a3f4..48349e7
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@@ -173,16 -176,16 +173,8 @@@ protected
  
  		virtual void	CallbackTriggers();
  
++		virtual PHY_IVehicle* GetVehicleConstraint(int constraintId);
  
--#ifdef NEW_BULLET_VEHICLE_SUPPORT
--		//complex constraint for vehicles
--		virtual PHY_IVehicle*	GetVehicleConstraint(int constraintId);
--#else
--		virtual class PHY_IVehicle*	GetVehicleConstraint(int constraintId)
--		{
--			return 0;
--		}
--#endif  /* NEW_BULLET_VEHICLE_SUPPORT */
  		// Character physics wrapper
  		virtual PHY_ICharacter*	GetCharacterController(class KX_GameObject* ob);




More information about the Bf-blender-cvs mailing list