From 09ddf554e4f8532ef04f201301317a6e988df524 Mon Sep 17 00:00:00 2001
From: erwin coumans <erwin.coumans@gmail.com>
Date: Fri, 3 May 2013 09:25:57 -0700
Subject: [PATCH] patch to make Bullet 2.x bridge work (should be applied soon)

---
 bullet2.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/bullet2.patch b/bullet2.patch
index 4d0c74681..64c1e3ec7 100644
--- a/bullet2.patch
+++ b/bullet2.patch
@@ -406,6 +406,14 @@ Index: build/premake4.lua
 -	include "../Demos/HelloWorld"
 -	include "../Demos/Benchmarks"
 -	
+Index: build/premake4_linux
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: build/premake4_osx
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
 Index: build/vs2010.bat
 ===================================================================
 --- build/vs2010.bat	(revision 2640)
@@ -433,6 +441,22 @@ Index: Demos/OpenGL/DemoApplication.cpp
  		
  		aabbMin-=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT);
  		aabbMax+=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT);
+Index: Demos/OpenGL/DemoApplication.h
+===================================================================
+--- Demos/OpenGL/DemoApplication.h	(revision 2640)
++++ Demos/OpenGL/DemoApplication.h	(working copy)
+@@ -149,6 +149,11 @@
+ 	{
+ 		m_azi = azi;
+ 	}
++
++	void	setEle(float ele)
++	{
++		m_ele = ele;
++	}
+ 	
+ 	void	setCameraUp(const btVector3& camUp)
+ 	{
 Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
 ===================================================================
 --- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp	(revision 2640)