[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11229] branches/pyapi_devel: merge from trunk

Campbell Barton cbarton at metavr.com
Wed Jul 11 14:58:43 CEST 2007


Revision: 11229
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11229
Author:   campbellbarton
Date:     2007-07-11 14:58:39 +0200 (Wed, 11 Jul 2007)

Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    branches/pyapi_devel/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/pyapi_devel/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/pyapi_devel/config/darwin-config.py
    branches/pyapi_devel/config/linux2-config.py
    branches/pyapi_devel/config/linuxcross-config.py
    branches/pyapi_devel/config/openbsd3-config.py
    branches/pyapi_devel/config/sunos5-config.py
    branches/pyapi_devel/config/win32-mingw-config.py
    branches/pyapi_devel/config/win32-vc-config.py
    branches/pyapi_devel/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/pyapi_devel/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/pyapi_devel/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/pyapi_devel/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/pyapi_devel/extern/bullet2/src/LinearMath/btQuickprof.h
    branches/pyapi_devel/extern/bullet2/src/LinearMath/btScalar.h
    branches/pyapi_devel/extern/bullet2/src/LinearMath/btTransform.h
    branches/pyapi_devel/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/pyapi_devel/extern/verse/Makefile
    branches/pyapi_devel/extern/verse/dist/v_connection.c
    branches/pyapi_devel/extern/verse/dist/v_network.c
    branches/pyapi_devel/intern/boolop/intern/BOP_BSPNode.cpp
    branches/pyapi_devel/intern/boolop/intern/BOP_Face2Face.cpp
    branches/pyapi_devel/intern/boolop/intern/BOP_MathUtils.cpp
    branches/pyapi_devel/intern/boolop/intern/BOP_Merge.cpp
    branches/pyapi_devel/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/pyapi_devel/intern/make/msvc_7_0/intern.sln
    branches/pyapi_devel/po/fr.po
    branches/pyapi_devel/po/it.po
    branches/pyapi_devel/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/pyapi_devel/release/Makefile
    branches/pyapi_devel/release/datafiles/blenderbuttons
    branches/pyapi_devel/release/scripts/bpymodules/BPyRender.py
    branches/pyapi_devel/release/scripts/image_auto_layout.py
    branches/pyapi_devel/release/scripts/object_random_loc_sz_rot.py
    branches/pyapi_devel/release/scripts/uvcalc_lightmap.py
    branches/pyapi_devel/source/Makefile
    branches/pyapi_devel/source/blender/SConscript
    branches/pyapi_devel/source/blender/blenkernel/BKE_idprop.h
    branches/pyapi_devel/source/blender/blenkernel/BKE_node.h
    branches/pyapi_devel/source/blender/blenkernel/BKE_verse.h
    branches/pyapi_devel/source/blender/blenkernel/SConscript
    branches/pyapi_devel/source/blender/blenkernel/intern/Makefile
    branches/pyapi_devel/source/blender/blenkernel/intern/constraint.c
    branches/pyapi_devel/source/blender/blenkernel/intern/idprop.c
    branches/pyapi_devel/source/blender/blenkernel/intern/image.c
    branches/pyapi_devel/source/blender/blenkernel/intern/library.c
    branches/pyapi_devel/source/blender/blenkernel/intern/node.c
    branches/pyapi_devel/source/blender/blenkernel/intern/object.c
    branches/pyapi_devel/source/blender/blenkernel/intern/verse_geometry_node.c
    branches/pyapi_devel/source/blender/blenlib/BLI_arithb.h
    branches/pyapi_devel/source/blender/blenlib/intern/arithb.c
    branches/pyapi_devel/source/blender/blenloader/intern/readfile.c
    branches/pyapi_devel/source/blender/blenloader/intern/writefile.c
    branches/pyapi_devel/source/blender/ftfont/intern/FTF_TTFont.cpp
    branches/pyapi_devel/source/blender/imbuf/IMB_imbuf.h
    branches/pyapi_devel/source/blender/imbuf/IMB_imbuf_types.h
    branches/pyapi_devel/source/blender/imbuf/SConscript
    branches/pyapi_devel/source/blender/imbuf/intern/Makefile
    branches/pyapi_devel/source/blender/imbuf/intern/imageprocess.c
    branches/pyapi_devel/source/blender/imbuf/intern/readimage.c
    branches/pyapi_devel/source/blender/imbuf/intern/util.c
    branches/pyapi_devel/source/blender/imbuf/intern/writeimage.c
    branches/pyapi_devel/source/blender/include/BDR_drawaction.h
    branches/pyapi_devel/source/blender/include/BIF_editaction.h
    branches/pyapi_devel/source/blender/include/BIF_editseq.h
    branches/pyapi_devel/source/blender/include/BIF_resources.h
    branches/pyapi_devel/source/blender/include/BSE_editaction_types.h
    branches/pyapi_devel/source/blender/include/blendef.h
    branches/pyapi_devel/source/blender/makesdna/DNA_ID.h
    branches/pyapi_devel/source/blender/makesdna/DNA_scene_types.h
    branches/pyapi_devel/source/blender/makesdna/DNA_userdef_types.h
    branches/pyapi_devel/source/blender/nodes/CMP_node.h
    branches/pyapi_devel/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/pyapi_devel/source/blender/src/Makefile
    branches/pyapi_devel/source/blender/src/SConscript
    branches/pyapi_devel/source/blender/src/blenderbuttons.c
    branches/pyapi_devel/source/blender/src/buttons_scene.c
    branches/pyapi_devel/source/blender/src/drawaction.c
    branches/pyapi_devel/source/blender/src/drawimage.c
    branches/pyapi_devel/source/blender/src/drawipo.c
    branches/pyapi_devel/source/blender/src/drawnla.c
    branches/pyapi_devel/source/blender/src/editaction.c
    branches/pyapi_devel/source/blender/src/editarmature.c
    branches/pyapi_devel/source/blender/src/editdeform.c
    branches/pyapi_devel/source/blender/src/editipo.c
    branches/pyapi_devel/source/blender/src/editipo_mods.c
    branches/pyapi_devel/source/blender/src/editmesh_tools.c
    branches/pyapi_devel/source/blender/src/editnode.c
    branches/pyapi_devel/source/blender/src/editseq.c
    branches/pyapi_devel/source/blender/src/filesel.c
    branches/pyapi_devel/source/blender/src/header_action.c
    branches/pyapi_devel/source/blender/src/header_info.c
    branches/pyapi_devel/source/blender/src/header_ipo.c
    branches/pyapi_devel/source/blender/src/header_seq.c
    branches/pyapi_devel/source/blender/src/header_view3d.c
    branches/pyapi_devel/source/blender/src/language.c
    branches/pyapi_devel/source/blender/src/renderwin.c
    branches/pyapi_devel/source/blender/src/sculptmode-stroke.c
    branches/pyapi_devel/source/blender/src/sculptmode.c
    branches/pyapi_devel/source/blender/src/space.c
    branches/pyapi_devel/source/blender/src/toolbox.c
    branches/pyapi_devel/source/blender/src/writeimage.c
    branches/pyapi_devel/source/creator/creator.c
    branches/pyapi_devel/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/pyapi_devel/source/gameengine/Ketsji/KX_GameObject.h
    branches/pyapi_devel/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/pyapi_devel/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/pyapi_devel/source/gameengine/SceneGraph/SG_Node.h
    branches/pyapi_devel/source/nan_definitions.mk
    branches/pyapi_devel/tools/btools.py

Removed Paths:
-------------
    branches/pyapi_devel/intern/action/
    branches/pyapi_devel/intern/csg/
    branches/pyapi_devel/intern/keymaker/

Modified: branches/pyapi_devel/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/pyapi_devel/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/pyapi_devel/config/darwin-config.py
===================================================================
--- branches/pyapi_devel/config/darwin-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/darwin-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -52,6 +52,7 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
 
+WITH_BF_DDS = 'true'
 
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'

Modified: branches/pyapi_devel/config/linux2-config.py
===================================================================
--- branches/pyapi_devel/config/linux2-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/linux2-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -32,6 +32,8 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr'
 BF_JPEG_INC = '${BF_JPEG}/include'
@@ -62,7 +64,7 @@
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
-WITH_BF_GAMEENGINE='false'
+WITH_BF_GAMEENGINE='true'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'

Modified: branches/pyapi_devel/config/linuxcross-config.py
===================================================================
--- branches/pyapi_devel/config/linuxcross-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/linuxcross-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -39,6 +39,8 @@
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/pyapi_devel/config/openbsd3-config.py
===================================================================
--- branches/pyapi_devel/config/openbsd3-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/openbsd3-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -28,6 +28,8 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr/local'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/pyapi_devel/config/sunos5-config.py
===================================================================
--- branches/pyapi_devel/config/sunos5-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/sunos5-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -29,6 +29,8 @@
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr/local'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/pyapi_devel/config/win32-mingw-config.py
===================================================================
--- branches/pyapi_devel/config/win32-mingw-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/win32-mingw-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -42,6 +42,8 @@
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
@@ -60,7 +62,6 @@
 WITH_BF_ZLIB = 'true'
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
-#BF_ZLIB_LIB = 'z'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = 'true'
@@ -109,9 +110,6 @@
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
 # if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
 BF_FREETYPE = LIBDIR + '/gcc/freetype'
@@ -141,8 +139,6 @@
 ##
 CC = 'gcc'
 CXX = 'g++'
-##ifeq ($CPU),alpha)
-##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
 
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 
@@ -150,22 +146,13 @@
 CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
 REL_CFLAGS = [ '-O2' ]
 REL_CCFLAGS = [ '-O2' ]
-##BF_DEPEND = 'true'
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
+
 C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
 
 CC_WARN = [ '-Wall' ]
 
-##FIX_STUBS_WARNINGS = -Wno-unused
+LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
 
-LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
 BF_DEBUG = 'false'
 BF_DEBUG_FLAGS= '-g'
 

Modified: branches/pyapi_devel/config/win32-vc-config.py
===================================================================
--- branches/pyapi_devel/config/win32-vc-config.py	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/config/win32-vc-config.py	2007-07-11 12:58:39 UTC (rev 11229)
@@ -50,6 +50,8 @@
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/pyapi_devel/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/pyapi_devel/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2007-07-11 12:58:39 UTC (rev 11229)
@@ -681,6 +681,12 @@
 						RelativePath="..\..\src\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.h">
 					</File>
 					<File
+						RelativePath="..\..\src\BulletCollision\CollisionShapes\btCapsuleShape.cpp">
+					</File>
+					<File
+						RelativePath="..\..\src\BulletCollision\CollisionShapes\btCapsuleShape.h">
+					</File>
+					<File
 						RelativePath="..\..\src\BulletCollision\CollisionShapes\btCollisionMargin.h">
 					</File>
 					<File

Modified: branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
===================================================================
--- branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp	2007-07-11 12:58:39 UTC (rev 11229)
@@ -24,7 +24,8 @@
 int	gOverlappingPairs = 0;
 
 btOverlappingPairCache::btOverlappingPairCache():
-m_blockedForChanges(false)
+m_blockedForChanges(false),
+m_overlapFilterCallback(0)
 //m_NumOverlapBroadphasePair(0)
 {
 }

Modified: branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
===================================================================
--- branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h	2007-07-11 12:58:39 UTC (rev 11229)
@@ -26,13 +26,20 @@
 
 struct	btOverlapCallback
 {
-virtual ~btOverlapCallback()
-{
-}
+	virtual ~btOverlapCallback()
+	{}
 	//return true for deletion of the pair
 	virtual bool	processOverlap(btBroadphasePair& pair) = 0;
 };
 
+struct btOverlapFilterCallback
+{
+	virtual ~btOverlapFilterCallback()
+	{}
+	// return true when pairs need collision
+	virtual bool	needBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const = 0;
+};
+
 ///btOverlappingPairCache maintains the objects with overlapping AABB
 ///Typically managed by the Broadphase, Axis3Sweep or btSimpleBroadphase
 class	btOverlappingPairCache : public btBroadphaseInterface
@@ -44,6 +51,8 @@
 		//during the dispatch, check that user doesn't destroy/create proxy
 		bool		m_blockedForChanges;
 		
+		//if set, use the callback instead of the built in filter in needBroadphaseCollision
+		btOverlapFilterCallback* m_overlapFilterCallback;
 	public:
 			
 		btOverlappingPairCache();	
@@ -67,6 +76,9 @@
 
 		inline bool needsBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
 		{
+			if (m_overlapFilterCallback)
+				return m_overlapFilterCallback->needBroadphaseCollision(proxy0,proxy1);
+
 			bool collides = (proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
 			collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
 			
@@ -92,7 +104,17 @@
 			return m_overlappingPairArray.size();
 		}
 		
+		btOverlapFilterCallback* getOverlapFilterCallback()
+		{
+			return m_overlapFilterCallback;
+		}
 
+		void setOverlapFilterCallback(btOverlapFilterCallback* callback)
+		{
+			m_overlapFilterCallback = callback;
+		}
+
 };
 #endif //OVERLAPPING_PAIR_CACHE_H
 
+

Modified: branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
===================================================================
--- branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h	2007-07-11 12:58:39 UTC (rev 11229)
@@ -41,6 +41,8 @@
 class btSimpleBroadphase : public btOverlappingPairCache
 {
 
+protected:
+
 	btSimpleBroadphaseProxy*	m_proxies;
 	int*				m_freeProxies;
 	int				m_firstFreeProxy;

Modified: branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
===================================================================
--- branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp	2007-07-11 10:32:37 UTC (rev 11228)
+++ branches/pyapi_devel/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp	2007-07-11 12:58:39 UTC (rev 11229)
@@ -273,6 +273,8 @@
 		
 	if ((!body0->isActive()) && (!body1->isActive()))

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list