[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13520] branches/animsys-aligorith: == AnimSys Branch - Merge from Trunk ==

Joshua Leung aligorith at gmail.com
Sat Feb 2 11:13:23 CET 2008


Revision: 13520
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13520
Author:   aligorith
Date:     2008-02-02 11:13:23 +0100 (Sat, 02 Feb 2008)

Log Message:
-----------
== AnimSys Branch - Merge from Trunk ==

Merge from trunk: r. 13378/13379 - 13519 (head)

Modified Paths:
--------------
    branches/animsys-aligorith/CMakeLists.txt
    branches/animsys-aligorith/SConstruct
    branches/animsys-aligorith/config/linux2-config.py
    branches/animsys-aligorith/extern/CMakeLists.txt
    branches/animsys-aligorith/extern/SConscript
    branches/animsys-aligorith/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/animsys-aligorith/extern/bullet2/src/SConscript
    branches/animsys-aligorith/intern/elbeem/CMakeLists.txt
    branches/animsys-aligorith/intern/elbeem/SConscript
    branches/animsys-aligorith/intern/elbeem/intern/isosurface.cpp
    branches/animsys-aligorith/intern/guardedalloc/MEM_guardedalloc.h
    branches/animsys-aligorith/intern/guardedalloc/intern/mallocn.c
    branches/animsys-aligorith/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/animsys-aligorith/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
    branches/animsys-aligorith/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/animsys-aligorith/release/scripts/add_mesh_torus.py
    branches/animsys-aligorith/release/scripts/lightwave_import.py
    branches/animsys-aligorith/release/scripts/wizard_curve2tree.py
    branches/animsys-aligorith/source/blender/blenkernel/BKE_armature.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_image.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_modifier.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_particle.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_softbody.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_utildefines.h
    branches/animsys-aligorith/source/blender/blenkernel/CMakeLists.txt
    branches/animsys-aligorith/source/blender/blenkernel/SConscript
    branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/Makefile
    branches/animsys-aligorith/source/blender/blenkernel/intern/armature.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/constraint.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/depsgraph.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/image.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/mesh.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/modifier.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/particle.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/particle_system.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/scene.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/softbody.c
    branches/animsys-aligorith/source/blender/blenlib/intern/storage.c
    branches/animsys-aligorith/source/blender/blenloader/intern/readfile.c
    branches/animsys-aligorith/source/blender/blenloader/intern/readfile.h
    branches/animsys-aligorith/source/blender/blenloader/intern/writefile.c
    branches/animsys-aligorith/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/animsys-aligorith/source/blender/imbuf/intern/scaling.c
    branches/animsys-aligorith/source/blender/include/BDR_drawaction.h
    branches/animsys-aligorith/source/blender/include/BDR_sculptmode.h
    branches/animsys-aligorith/source/blender/include/BIF_editaction.h
    branches/animsys-aligorith/source/blender/include/BIF_editarmature.h
    branches/animsys-aligorith/source/blender/include/BIF_editdeform.h
    branches/animsys-aligorith/source/blender/include/BIF_editsima.h
    branches/animsys-aligorith/source/blender/include/BIF_outliner.h
    branches/animsys-aligorith/source/blender/include/BIF_poseobject.h
    branches/animsys-aligorith/source/blender/include/BIF_transform.h
    branches/animsys-aligorith/source/blender/include/BSE_editipo.h
    branches/animsys-aligorith/source/blender/include/BSE_node.h
    branches/animsys-aligorith/source/blender/include/BSE_seqscopes.h
    branches/animsys-aligorith/source/blender/include/butspace.h
    branches/animsys-aligorith/source/blender/include/transform.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_action_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_armature_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_constraint_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_modifier_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_object_force.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_particle_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_scene_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_sequence_types.h
    branches/animsys-aligorith/source/blender/makesdna/DNA_space_types.h
    branches/animsys-aligorith/source/blender/makesdna/intern/makesdna.c
    branches/animsys-aligorith/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/animsys-aligorith/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
    branches/animsys-aligorith/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    branches/animsys-aligorith/source/blender/python/BPY_interface.c
    branches/animsys-aligorith/source/blender/python/api2_2x/Makefile
    branches/animsys-aligorith/source/blender/python/api2_2x/Mathutils.c
    branches/animsys-aligorith/source/blender/python/api2_2x/doc/Render.py
    branches/animsys-aligorith/source/blender/python/api2_2x/quat.c
    branches/animsys-aligorith/source/blender/python/api2_2x/sceneRender.c
    branches/animsys-aligorith/source/blender/python/api2_2x/sceneRender.h
    branches/animsys-aligorith/source/blender/render/extern/include/RE_pipeline.h
    branches/animsys-aligorith/source/blender/render/extern/include/RE_shader_ext.h
    branches/animsys-aligorith/source/blender/render/intern/include/occlusion.h
    branches/animsys-aligorith/source/blender/render/intern/include/render_types.h
    branches/animsys-aligorith/source/blender/render/intern/include/rendercore.h
    branches/animsys-aligorith/source/blender/render/intern/include/renderdatabase.h
    branches/animsys-aligorith/source/blender/render/intern/include/shading.h
    branches/animsys-aligorith/source/blender/render/intern/include/strand.h
    branches/animsys-aligorith/source/blender/render/intern/include/zbuf.h
    branches/animsys-aligorith/source/blender/render/intern/source/convertblender.c
    branches/animsys-aligorith/source/blender/render/intern/source/envmap.c
    branches/animsys-aligorith/source/blender/render/intern/source/occlusion.c
    branches/animsys-aligorith/source/blender/render/intern/source/pipeline.c
    branches/animsys-aligorith/source/blender/render/intern/source/pixelblending.c
    branches/animsys-aligorith/source/blender/render/intern/source/rendercore.c
    branches/animsys-aligorith/source/blender/render/intern/source/renderdatabase.c
    branches/animsys-aligorith/source/blender/render/intern/source/shadeinput.c
    branches/animsys-aligorith/source/blender/render/intern/source/sss.c
    branches/animsys-aligorith/source/blender/render/intern/source/strand.c
    branches/animsys-aligorith/source/blender/render/intern/source/zbuf.c
    branches/animsys-aligorith/source/blender/src/buttons_editing.c
    branches/animsys-aligorith/source/blender/src/buttons_object.c
    branches/animsys-aligorith/source/blender/src/buttons_scene.c
    branches/animsys-aligorith/source/blender/src/buttons_shading.c
    branches/animsys-aligorith/source/blender/src/drawaction.c
    branches/animsys-aligorith/source/blender/src/drawarmature.c
    branches/animsys-aligorith/source/blender/src/drawobject.c
    branches/animsys-aligorith/source/blender/src/drawseq.c
    branches/animsys-aligorith/source/blender/src/drawtime.c
    branches/animsys-aligorith/source/blender/src/drawview.c
    branches/animsys-aligorith/source/blender/src/edit.c
    branches/animsys-aligorith/source/blender/src/editaction.c
    branches/animsys-aligorith/source/blender/src/editarmature.c
    branches/animsys-aligorith/source/blender/src/editconstraint.c
    branches/animsys-aligorith/source/blender/src/editdeform.c
    branches/animsys-aligorith/source/blender/src/editipo.c
    branches/animsys-aligorith/source/blender/src/editmesh.c
    branches/animsys-aligorith/source/blender/src/editmesh_tools.c
    branches/animsys-aligorith/source/blender/src/editnode.c
    branches/animsys-aligorith/source/blender/src/editobject.c
    branches/animsys-aligorith/source/blender/src/editseq.c
    branches/animsys-aligorith/source/blender/src/editsima.c
    branches/animsys-aligorith/source/blender/src/header_action.c
    branches/animsys-aligorith/source/blender/src/header_image.c
    branches/animsys-aligorith/source/blender/src/header_node.c
    branches/animsys-aligorith/source/blender/src/header_seq.c
    branches/animsys-aligorith/source/blender/src/header_view3d.c
    branches/animsys-aligorith/source/blender/src/meshlaplacian.c
    branches/animsys-aligorith/source/blender/src/outliner.c
    branches/animsys-aligorith/source/blender/src/poselib.c
    branches/animsys-aligorith/source/blender/src/poseobject.c
    branches/animsys-aligorith/source/blender/src/previewrender.c
    branches/animsys-aligorith/source/blender/src/resources.c
    branches/animsys-aligorith/source/blender/src/sculptmode-stroke.c
    branches/animsys-aligorith/source/blender/src/sculptmode.c
    branches/animsys-aligorith/source/blender/src/seqscopes.c
    branches/animsys-aligorith/source/blender/src/sequence.c
    branches/animsys-aligorith/source/blender/src/space.c
    branches/animsys-aligorith/source/blender/src/transform.c
    branches/animsys-aligorith/source/blender/src/transform_conversions.c
    branches/animsys-aligorith/source/blender/src/transform_generics.c
    branches/animsys-aligorith/source/blender/src/usiblender.c
    branches/animsys-aligorith/source/blender/src/vpaint.c
    branches/animsys-aligorith/tools/Blender.py
    branches/animsys-aligorith/tools/btools.py

Added Paths:
-----------
    branches/animsys-aligorith/extern/bullet2/src/Bullet-C-Api.h
    branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
    branches/animsys-aligorith/release/scripts/bpymodules/blend2renderinfo.py
    branches/animsys-aligorith/release/scripts/render_save_layers.py
    branches/animsys-aligorith/source/blender/blenkernel/BKE_cloth.h
    branches/animsys-aligorith/source/blender/blenkernel/BKE_collision.h
    branches/animsys-aligorith/source/blender/blenkernel/intern/cloth.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/collision.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/implicit.c
    branches/animsys-aligorith/source/blender/blenkernel/intern/kdop.c
    branches/animsys-aligorith/source/blender/makesdna/DNA_cloth_types.h

Modified: branches/animsys-aligorith/CMakeLists.txt
===================================================================
--- branches/animsys-aligorith/CMakeLists.txt	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/CMakeLists.txt	2008-02-02 10:13:23 UTC (rev 13520)
@@ -65,8 +65,9 @@
 OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	OFF)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"	ON)
-OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"					OFF)
+OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
+OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
+OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -184,6 +185,13 @@
 
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
 
+  IF(WITH_OPENMP)
+    SET(LLIBS "${LLIBS} -lgomp ")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+  ENDIF(WITH_OPENMP)
+
+
   SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
   SET(PLATFORM_LINKFLAGS "-pthread")
@@ -270,6 +278,11 @@
   SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
   SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
 
+  IF(WITH_OPENMP)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+  ENDIF(WITH_OPENMP)
+
   SET(SDL ${LIBDIR}/sdl)
   SET(SDL_INC ${SDL}/include)
   SET(SDL_LIB SDL)
@@ -347,6 +360,12 @@
   SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
   SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 
+  IF(WITH_OPENMP)
+    SET(LLIBS "${LLIBS} -lgomp ")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+  ENDIF(WITH_OPENMP)
+
   SET(SDL ${LIBDIR}/sdl)
   SET(SDL_INC ${SDL}/include)
   SET(SDL_LIB SDL)
@@ -389,6 +408,9 @@
 IF(WITH_GAMEENGINE)
   SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
 ENDIF(WITH_GAMEENGINE)
+IF(WITH_BULLET)
+  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
+ENDIF(WITH_BULLET)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
 

Modified: branches/animsys-aligorith/SConstruct
===================================================================
--- branches/animsys-aligorith/SConstruct	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/SConstruct	2008-02-02 10:13:23 UTC (rev 13520)
@@ -176,6 +176,18 @@
     env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
     env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
+if env['WITH_BF_OPENMP'] == 1:
+	if env['OURPLATFORM']=='win32-vc':
+		env.Append(LINKFLAGS=['/openmp'])
+		env['CCFLAGS'].append('/openmp')
+		env['CPPFLAGS'].append('/openmp')
+		env['CXXFLAGS'].append('/openmp')
+	else:
+		env.Append(LINKFLAGS=['-lgomp'])
+		env['CCFLAGS'].append('-fopenmp')
+		env['CPPFLAGS'].append('-fopenmp')
+		env['CXXFLAGS'].append('-fopenmp')
+
 #check for additional debug libnames
 
 if env.has_key('BF_DEBUG_LIBS'):
@@ -398,7 +410,7 @@
                         '${LCGDIR}/zlib/lib/zlib.dll',
                         '${LCGDIR}/tiff/lib/libtiff.dll']
     if env['BF_DEBUG']:
-        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
+        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
     else:
         dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
     if env['OURPLATFORM'] == 'win32-mingw':

Modified: branches/animsys-aligorith/config/linux2-config.py
===================================================================
--- branches/animsys-aligorith/config/linux2-config.py	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/config/linux2-config.py	2008-02-02 10:13:23 UTC (rev 13520)
@@ -29,8 +29,12 @@
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 WITH_BF_DDS = 'true'
 

Modified: branches/animsys-aligorith/extern/CMakeLists.txt
===================================================================
--- branches/animsys-aligorith/extern/CMakeLists.txt	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/extern/CMakeLists.txt	2008-02-02 10:13:23 UTC (rev 13520)
@@ -29,11 +29,11 @@
 
 IF(WITH_GAMEENGINE)
   SUBDIRS(qhull solid)
+ENDIF(WITH_GAMEENGINE)
 
-  IF(WITH_BULLET)
+IF(WITH_BULLET)
     SUBDIRS(bullet2)
-  ENDIF(WITH_BULLET)
-ENDIF(WITH_GAMEENGINE)
+ENDIF(WITH_BULLET)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(bFTGL)

Modified: branches/animsys-aligorith/extern/SConscript
===================================================================
--- branches/animsys-aligorith/extern/SConscript	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/extern/SConscript	2008-02-02 10:13:23 UTC (rev 13520)
@@ -5,9 +5,10 @@
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['qhull/SConscript',
             'solid/SConscript'])
-    if env['WITH_BF_BULLET']:
-        SConscript(['bullet2/src/SConscript'])
 
+if env['WITH_BF_BULLET']:
+    SConscript(['bullet2/src/SConscript'])
+
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
 

Modified: branches/animsys-aligorith/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/animsys-aligorith/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-02-02 10:13:23 UTC (rev 13520)
@@ -340,6 +340,9 @@
 			<File
 				RelativePath="..\..\src\btBulletDynamicsCommon.h">
 			</File>
+			<File
+				RelativePath="..\..\src\Bullet-C-Api.h">
+			</File>
 			<Filter
 				Name="BulletDynamics"
 				Filter="">
@@ -428,6 +431,9 @@
 					<File
 						RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
 					</File>
+					<File
+						RelativePath="..\..\src\BulletDynamics\Dynamics\Bullet-C-API.cpp">
+					</File>
 				</Filter>
 				<Filter
 					Name="Vehicle"

Copied: branches/animsys-aligorith/extern/bullet2/src/Bullet-C-Api.h (from rev 13519, trunk/blender/extern/bullet2/src/Bullet-C-Api.h)
===================================================================
--- branches/animsys-aligorith/extern/bullet2/src/Bullet-C-Api.h	                        (rev 0)
+++ branches/animsys-aligorith/extern/bullet2/src/Bullet-C-Api.h	2008-02-02 10:13:23 UTC (rev 13520)
@@ -0,0 +1,37 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+	Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's.
+	Work in progress, functionality will be added on demand.
+
+	If possible, use the richer Bullet C++ API, by including "btBulletDynamicsCommon.h"
+*/
+
+#ifndef BULLET_C_API_H
+#define BULLET_C_API_H
+
+#ifdef __cplusplus
+extern "C" { 
+#endif
+
+double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //BULLET_C_API_H
+

Modified: branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/CMakeLists.txt
===================================================================
--- branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/CMakeLists.txt	2008-02-02 04:38:40 UTC (rev 13519)
+++ branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/CMakeLists.txt	2008-02-02 10:13:23 UTC (rev 13520)
@@ -13,6 +13,7 @@
 	ConstraintSolver/btTypedConstraint.cpp
 	Dynamics/btDiscreteDynamicsWorld.cpp
 	Dynamics/btSimpleDynamicsWorld.cpp
+	Dynamics/Bullet-C-API.cpp
 	Dynamics/btRigidBody.cpp
 	Vehicle/btRaycastVehicle.cpp
 	Vehicle/btWheelInfo.cpp

Copied: branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp (from rev 13519, trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp)
===================================================================
--- branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp	                        (rev 0)
+++ branches/animsys-aligorith/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp	2008-02-02 10:13:23 UTC (rev 13520)
@@ -0,0 +1,120 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list