[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17123] branches/etch-a-ton: Merge 16964: 17122
Martin Poirier
theeth at yahoo.com
Mon Oct 20 02:27:33 CEST 2008
Revision: 17123
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17123
Author: theeth
Date: 2008-10-20 02:27:33 +0200 (Mon, 20 Oct 2008)
Log Message:
-----------
Merge 16964:17122
Modified Paths:
--------------
branches/etch-a-ton/SConstruct
branches/etch-a-ton/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/etch-a-ton/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/etch-a-ton/config/darwin-config.py
branches/etch-a-ton/config/linux2-config.py
branches/etch-a-ton/config/linuxcross-config.py
branches/etch-a-ton/config/openbsd3-config.py
branches/etch-a-ton/config/sunos5-config.py
branches/etch-a-ton/config/win32-mingw-config.py
branches/etch-a-ton/config/win32-vc-config.py
branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/etch-a-ton/intern/SoundSystem/SND_Utils.h
branches/etch-a-ton/intern/SoundSystem/fmod/SND_FmodDevice.cpp
branches/etch-a-ton/intern/SoundSystem/intern/SND_Scene.cpp
branches/etch-a-ton/intern/SoundSystem/intern/SND_SoundObject.cpp
branches/etch-a-ton/intern/SoundSystem/intern/SND_Utils.cpp
branches/etch-a-ton/intern/elbeem/intern/elbeem.cpp
branches/etch-a-ton/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/etch-a-ton/po/ar.po
branches/etch-a-ton/po/bg.po
branches/etch-a-ton/po/cs.po
branches/etch-a-ton/po/el.po
branches/etch-a-ton/po/fr.po
branches/etch-a-ton/po/hr.po
branches/etch-a-ton/po/it.po
branches/etch-a-ton/po/ko.po
branches/etch-a-ton/po/ro.po
branches/etch-a-ton/po/ru.po
branches/etch-a-ton/po/sr.po
branches/etch-a-ton/po/sr at Latn.po
branches/etch-a-ton/po/uk.po
branches/etch-a-ton/po/zh_CN.po
branches/etch-a-ton/release/VERSION
branches/etch-a-ton/release/datafiles/splash.jpg
branches/etch-a-ton/release/scripts/bvh_import.py
branches/etch-a-ton/release/scripts/c3d_import.py
branches/etch-a-ton/release/scripts/config.py
branches/etch-a-ton/release/scripts/export_fbx.py
branches/etch-a-ton/release/scripts/export_obj.py
branches/etch-a-ton/release/scripts/help_browser.py
branches/etch-a-ton/release/scripts/hotkeys.py
branches/etch-a-ton/release/scripts/import_obj.py
branches/etch-a-ton/release/scripts/render_save_layers.py
branches/etch-a-ton/release/scripts/scripttemplate_gamelogic_basic.py
branches/etch-a-ton/release/scripts/vrml97_export.py
branches/etch-a-ton/release/text/BlenderQuickStart.pdf
branches/etch-a-ton/release/text/Python-license.txt
branches/etch-a-ton/release/windows/installer/00.sconsblender.nsi
branches/etch-a-ton/source/blender/blenkernel/BKE_blender.h
branches/etch-a-ton/source/blender/blenkernel/intern/bullet.c
branches/etch-a-ton/source/blender/blenkernel/intern/collision.c
branches/etch-a-ton/source/blender/blenkernel/intern/idprop.c
branches/etch-a-ton/source/blender/blenkernel/intern/image.c
branches/etch-a-ton/source/blender/blenkernel/intern/key.c
branches/etch-a-ton/source/blender/blenkernel/intern/library.c
branches/etch-a-ton/source/blender/blenkernel/intern/modifier.c
branches/etch-a-ton/source/blender/blenkernel/intern/multires.c
branches/etch-a-ton/source/blender/blenkernel/intern/particle_system.c
branches/etch-a-ton/source/blender/blenlib/intern/dynlib.c
branches/etch-a-ton/source/blender/blenlib/intern/fileops.c
branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
branches/etch-a-ton/source/blender/gpu/GPU_extensions.h
branches/etch-a-ton/source/blender/gpu/intern/gpu_draw.c
branches/etch-a-ton/source/blender/gpu/intern/gpu_extensions.c
branches/etch-a-ton/source/blender/gpu/intern/gpu_material.c
branches/etch-a-ton/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/etch-a-ton/source/blender/imbuf/intern/cineon/cineonlib.c
branches/etch-a-ton/source/blender/imbuf/intern/cineon/dpxlib.c
branches/etch-a-ton/source/blender/imbuf/intern/dynlibtiff.c
branches/etch-a-ton/source/blender/include/BDR_gpencil.h
branches/etch-a-ton/source/blender/include/BIF_drawgpencil.h
branches/etch-a-ton/source/blender/include/BIF_keyframing.h
branches/etch-a-ton/source/blender/makesdna/DNA_constraint_types.h
branches/etch-a-ton/source/blender/makesdna/DNA_gpencil_types.h
branches/etch-a-ton/source/blender/makesdna/DNA_userdef_types.h
branches/etch-a-ton/source/blender/python/BPY_menus.c
branches/etch-a-ton/source/blender/python/SConscript
branches/etch-a-ton/source/blender/python/api2_2x/Armature.c
branches/etch-a-ton/source/blender/python/api2_2x/Ipocurve.c
branches/etch-a-ton/source/blender/python/api2_2x/Material.c
branches/etch-a-ton/source/blender/python/api2_2x/Mesh.c
branches/etch-a-ton/source/blender/python/api2_2x/Object.c
branches/etch-a-ton/source/blender/python/api2_2x/Particle.c
branches/etch-a-ton/source/blender/python/api2_2x/Window.c
branches/etch-a-ton/source/blender/python/api2_2x/doc/BGL.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Ipo.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/IpoCurve.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Material.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Noise.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Object.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Particle.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Render.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Text.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/Texture.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/etch-a-ton/source/blender/python/api2_2x/sceneRender.c
branches/etch-a-ton/source/blender/render/intern/include/sss.h
branches/etch-a-ton/source/blender/render/intern/include/zbuf.h
branches/etch-a-ton/source/blender/render/intern/source/convertblender.c
branches/etch-a-ton/source/blender/render/intern/source/envmap.c
branches/etch-a-ton/source/blender/render/intern/source/shadeoutput.c
branches/etch-a-ton/source/blender/render/intern/source/sss.c
branches/etch-a-ton/source/blender/render/intern/source/zbuf.c
branches/etch-a-ton/source/blender/src/buttons_editing.c
branches/etch-a-ton/source/blender/src/buttons_logic.c
branches/etch-a-ton/source/blender/src/buttons_object.c
branches/etch-a-ton/source/blender/src/buttons_shading.c
branches/etch-a-ton/source/blender/src/drawaction.c
branches/etch-a-ton/source/blender/src/drawgpencil.c
branches/etch-a-ton/source/blender/src/drawimage.c
branches/etch-a-ton/source/blender/src/drawnode.c
branches/etch-a-ton/source/blender/src/drawobject.c
branches/etch-a-ton/source/blender/src/drawseq.c
branches/etch-a-ton/source/blender/src/editaction.c
branches/etch-a-ton/source/blender/src/editaction_gpencil.c
branches/etch-a-ton/source/blender/src/editconstraint.c
branches/etch-a-ton/source/blender/src/editmesh.c
branches/etch-a-ton/source/blender/src/editnode.c
branches/etch-a-ton/source/blender/src/fluidsim.c
branches/etch-a-ton/source/blender/src/ghostwinlay.c
branches/etch-a-ton/source/blender/src/gpencil.c
branches/etch-a-ton/source/blender/src/hddaudio.c
branches/etch-a-ton/source/blender/src/header_view3d.c
branches/etch-a-ton/source/blender/src/imagepaint.c
branches/etch-a-ton/source/blender/src/keyframing.c
branches/etch-a-ton/source/blender/src/outliner.c
branches/etch-a-ton/source/blender/src/playanim.c
branches/etch-a-ton/source/blender/src/sequence.c
branches/etch-a-ton/source/blender/src/space.c
branches/etch-a-ton/source/blender/src/splash.jpg.c
branches/etch-a-ton/source/blender/src/transform_conversions.c
branches/etch-a-ton/source/blender/src/view.c
branches/etch-a-ton/source/blender/yafray/intern/export_Plugin.cpp
branches/etch-a-ton/source/creator/CMakeLists.txt
branches/etch-a-ton/source/creator/SConscript
branches/etch-a-ton/source/creator/creator.c
branches/etch-a-ton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/etch-a-ton/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/etch-a-ton/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/etch-a-ton/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/etch-a-ton/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/etch-a-ton/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/etch-a-ton/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/etch-a-ton/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/etch-a-ton/source/gameengine/GameLogic/SCA_ISensor.h
branches/etch-a-ton/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/etch-a-ton/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/etch-a-ton/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/etch-a-ton/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_GameObject.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_PythonInit.h
branches/etch-a-ton/source/gameengine/Ketsji/KX_Scene.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_TouchSensor.h
branches/etch-a-ton/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/etch-a-ton/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/etch-a-ton/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/etch-a-ton/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/etch-a-ton/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/etch-a-ton/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/etch-a-ton/source/gameengine/PyDoc/GameLogic.py
branches/etch-a-ton/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/etch-a-ton/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/etch-a-ton/source/gameengine/PyDoc/KX_IpoActuator.py
branches/etch-a-ton/source/gameengine/PyDoc/Rasterizer.py
branches/etch-a-ton/source/gameengine/PyDoc/epy_docgen.sh
branches/etch-a-ton/tools/Blender.py
branches/etch-a-ton/tools/btools.py
Added Paths:
-----------
branches/etch-a-ton/release/scripts/import_web3d.py
branches/etch-a-ton/release/text/release_248.txt
branches/etch-a-ton/source/blender/python/api2_2x/doc/Renderlayer.py
branches/etch-a-ton/source/blender/python/api2_2x/doc/SConscript
branches/etch-a-ton/source/gameengine/PyDoc/SCA_JoystickSensor.py
Property Changed:
----------------
branches/etch-a-ton/source/blender/include/BDR_gpencil.h
branches/etch-a-ton/source/blender/include/BIF_drawgpencil.h
branches/etch-a-ton/source/blender/include/BIF_keyframing.h
branches/etch-a-ton/source/blender/makesdna/DNA_gpencil_types.h
branches/etch-a-ton/source/blender/src/drawgpencil.c
branches/etch-a-ton/source/blender/src/editaction_gpencil.c
branches/etch-a-ton/source/blender/src/gpencil.c
branches/etch-a-ton/source/blender/src/keyframing.c
Modified: branches/etch-a-ton/SConstruct
===================================================================
--- branches/etch-a-ton/SConstruct 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/SConstruct 2008-10-20 00:27:33 UTC (rev 17123)
@@ -277,15 +277,15 @@
env['WITH_BF_BINRELOC'] = False
env['BF_BUILDINFO'] = False
env['BF_NO_ELBEEM'] = True
-
-
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
-env['BUILDDIR'] = B.root_build_dir
+B.doc_build_dir = env['BF_DOCDIR']
if not B.root_build_dir[-1]==os.sep:
B.root_build_dir += os.sep
+if not B.doc_build_dir[-1]==os.sep:
+ B.doc_build_dir += os.sep
# We do a shortcut for clean when no quicklist is given: just delete
# builddir without reading in SConscripts
@@ -294,8 +294,18 @@
do_clean = True
if not quickie and do_clean:
+ if os.path.exists(B.doc_build_dir):
+ print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+ dirs = os.listdir(B.doc_build_dir)
+ for entry in dirs:
+ if os.path.isdir(B.doc_build_dir + entry) == 1:
+ print "clean dir %s"%(B.doc_build_dir+entry)
+ shutil.rmtree(B.doc_build_dir+entry)
+ else: # remove file
+ print "remove file %s"%(B.doc_build_dir+entry)
+ os.remove(B.root_build_dir+entry)
if os.path.exists(B.root_build_dir):
- print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+ print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
dirs = os.listdir(B.root_build_dir)
for entry in dirs:
if os.path.isdir(B.root_build_dir + entry) == 1:
@@ -321,6 +331,8 @@
os.makedirs ( B.root_build_dir + 'extern' )
os.makedirs ( B.root_build_dir + 'lib' )
os.makedirs ( B.root_build_dir + 'bin' )
+if not os.path.isdir(B.doc_build_dir):
+ os.makedirs ( B.doc_build_dir )
Help(opts.GenerateHelpText(env))
@@ -363,7 +375,8 @@
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
-env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+ env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
@@ -534,6 +547,10 @@
nsiscmd = env.Command('nsisinstaller', None, nsisaction)
nsisalias = env.Alias('nsis', nsiscmd)
+if 'blender' in B.targets:
+ blenderexe= env.Alias('blender', B.program_list)
+ Depends(blenderexe,installtarget)
+
if env['WITH_BF_PLAYER']:
blenderplayer = env.Alias('blenderplayer', B.program_list)
Depends(blenderplayer,installtarget)
@@ -560,5 +577,6 @@
# TODO: build stubs and link into blenderplayer
#------------ EPYDOC
-# TODO: run epydoc
+if env['WITH_BF_BPYDOC']:
+ SConscript(['source/blender/python/api2_2x/doc/SConscript'])
Modified: branches/etch-a-ton/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/el/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/etch-a-ton/config/darwin-config.py
===================================================================
--- branches/etch-a-ton/config/darwin-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/darwin-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -268,3 +268,4 @@
BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin'
+BF_DOCDIR='../install/doc'
Modified: branches/etch-a-ton/config/linux2-config.py
===================================================================
--- branches/etch-a-ton/config/linux2-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/linux2-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -205,6 +205,7 @@
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
+BF_DOCDIR='../install/doc'
#Link against pthread
Modified: branches/etch-a-ton/config/linuxcross-config.py
===================================================================
--- branches/etch-a-ton/config/linuxcross-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/linuxcross-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -148,3 +148,4 @@
BF_BUILDDIR = '../build/linuxcross'
BF_INSTALLDIR='../install/linuxcross'
+BF_DOCDIR='../install/doc'
Modified: branches/etch-a-ton/config/openbsd3-config.py
===================================================================
--- branches/etch-a-ton/config/openbsd3-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/openbsd3-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -163,3 +163,4 @@
BF_BUILDDIR='../build/openbsd3'
BF_INSTALLDIR='../install/openbsd3'
+BF_DOCDIR='../install/doc'
Modified: branches/etch-a-ton/config/sunos5-config.py
===================================================================
--- branches/etch-a-ton/config/sunos5-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/sunos5-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -177,6 +177,7 @@
BF_BUILDDIR = '../build/sunos5'
BF_INSTALLDIR='../install/sunos5'
+BF_DOCDIR='../install/doc'
PLATFORM_LINKFLAGS = ['']
Modified: branches/etch-a-ton/config/win32-mingw-config.py
===================================================================
--- branches/etch-a-ton/config/win32-mingw-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/win32-mingw-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -167,3 +167,4 @@
BF_BUILDDIR = '..\\build\\win32-mingw'
BF_INSTALLDIR='..\\install\\win32-mingw'
+BF_DOCDIR = '..\\install\\doc'
\ No newline at end of file
Modified: branches/etch-a-ton/config/win32-vc-config.py
===================================================================
--- branches/etch-a-ton/config/win32-vc-config.py 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/config/win32-vc-config.py 2008-10-20 00:27:33 UTC (rev 17123)
@@ -187,3 +187,4 @@
BF_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc'
+BF_DOCDIR='..\\install\\doc'
Modified: branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
===================================================================
--- branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-10-20 00:27:33 UTC (rev 17123)
@@ -1015,7 +1015,7 @@
btAssert(pt);
pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
- pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse;
+ pt->m_appliedImpulseLateral2 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse;
//do a callback here?
Modified: branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
--- branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-10-20 00:27:33 UTC (rev 17123)
@@ -423,6 +423,13 @@
void btDiscreteDynamicsWorld::removeRigidBody(btRigidBody* body)
{
+ //remove all constraints too
+ while (body->getNumConstraintRefs())
+ {
+ btTypedConstraint* constraint = body->getConstraintRef(0);
+ removeConstraint(constraint);
+ }
+
removeCollisionObject(body);
}
Modified: branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
===================================================================
--- branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2008-10-20 00:04:40 UTC (rev 17122)
+++ branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2008-10-20 00:27:33 UTC (rev 17123)
@@ -306,8 +306,16 @@
}
//
-void btSoftBody::appendAnchor(int node,btRigidBody* body)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list