[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17097] branches/soc-2008-unclezeiv: svn merge -r 16985:17095 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Fri Oct 17 21:17:45 CEST 2008
Revision: 17097
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17097
Author: unclezeiv
Date: 2008-10-17 21:17:45 +0200 (Fri, 17 Oct 2008)
Log Message:
-----------
svn merge -r 16985:17095 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/soc-2008-unclezeiv/intern/SoundSystem/SND_Utils.h
branches/soc-2008-unclezeiv/intern/SoundSystem/fmod/SND_FmodDevice.cpp
branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Scene.cpp
branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_SoundObject.cpp
branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Utils.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/elbeem.cpp
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-unclezeiv/po/ar.po
branches/soc-2008-unclezeiv/po/bg.po
branches/soc-2008-unclezeiv/po/cs.po
branches/soc-2008-unclezeiv/po/el.po
branches/soc-2008-unclezeiv/po/fr.po
branches/soc-2008-unclezeiv/po/hr.po
branches/soc-2008-unclezeiv/po/it.po
branches/soc-2008-unclezeiv/po/ko.po
branches/soc-2008-unclezeiv/po/ro.po
branches/soc-2008-unclezeiv/po/ru.po
branches/soc-2008-unclezeiv/po/sr.po
branches/soc-2008-unclezeiv/po/sr at Latn.po
branches/soc-2008-unclezeiv/po/uk.po
branches/soc-2008-unclezeiv/po/zh_CN.po
branches/soc-2008-unclezeiv/release/VERSION
branches/soc-2008-unclezeiv/release/datafiles/splash.jpg
branches/soc-2008-unclezeiv/release/scripts/c3d_import.py
branches/soc-2008-unclezeiv/release/scripts/config.py
branches/soc-2008-unclezeiv/release/scripts/help_browser.py
branches/soc-2008-unclezeiv/release/scripts/vrml97_export.py
branches/soc-2008-unclezeiv/release/text/Python-license.txt
branches/soc-2008-unclezeiv/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/bullet.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/collision.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/key.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/dynlib.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/fileops.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/gpu/GPU_extensions.h
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2008-unclezeiv/source/blender/include/BDR_gpencil.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_drawgpencil.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_keyframing.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_menus.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Ipocurve.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Window.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/BGL.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/IpoCurve.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Material.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Noise.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Particle.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Text.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/soc-2008-unclezeiv/source/blender/render/intern/include/sss.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/zbuf.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/envmap.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/sss.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/zbuf.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c
branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
branches/soc-2008-unclezeiv/source/blender/src/drawnode.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/drawseq.c
branches/soc-2008-unclezeiv/source/blender/src/editaction.c
branches/soc-2008-unclezeiv/source/blender/src/editaction_gpencil.c
branches/soc-2008-unclezeiv/source/blender/src/editnode.c
branches/soc-2008-unclezeiv/source/blender/src/fluidsim.c
branches/soc-2008-unclezeiv/source/blender/src/ghostwinlay.c
branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
branches/soc-2008-unclezeiv/source/blender/src/hddaudio.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/imagepaint.c
branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
branches/soc-2008-unclezeiv/source/blender/src/outliner.c
branches/soc-2008-unclezeiv/source/blender/src/sequence.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/splash.jpg.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2008-unclezeiv/source/creator/creator.c
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_IpoActuator.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/Rasterizer.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/epy_docgen.sh
Added Paths:
-----------
branches/soc-2008-unclezeiv/release/text/release_248.txt
Property Changed:
----------------
branches/soc-2008-unclezeiv/source/blender/include/BDR_gpencil.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_drawgpencil.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_keyframing.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c
branches/soc-2008-unclezeiv/source/blender/src/editaction_gpencil.c
branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/el/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -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/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -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/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -306,8 +306,16 @@
}
//
-void btSoftBody::appendAnchor(int node,btRigidBody* body)
+void btSoftBody::appendAnchor(int node,btRigidBody* body,bool disableCollisionWithBody=false)
{
+ if (disableCollisionWithBody)
+ {
+ if (m_collisionDisabledObjects.findLinearSearch(body)==m_collisionDisabledObjects.size())
+ {
+ m_collisionDisabledObjects.push_back(body);
+ }
+ }
+
Anchor a;
a.m_node = &m_nodes[node];
a.m_body = body;
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2008-10-17 19:17:45 UTC (rev 17097)
@@ -49,6 +49,8 @@
class btSoftBody : public btCollisionObject
{
public:
+ btAlignedObjectArray<class btCollisionObject*> m_collisionDisabledObjects;
+
//
// Enumerations
//
@@ -667,7 +669,7 @@
Material* mat=0);
/* Append anchor */
void appendAnchor( int node,
- btRigidBody* body);
+ btRigidBody* body,bool disableCollision);
/* Append linear joint */
void appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1);
void appendLinearJoint(const LJoint::Specs& specs,Body body=Body());
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -59,7 +59,10 @@
btSoftBody* softBody = m_isSwapped? (btSoftBody*)body1 : (btSoftBody*)body0;
btCollisionObject* rigidCollisionObject = m_isSwapped? body0 : body1;
- softBody->defaultCollisionHandler(rigidCollisionObject);
+ if (softBody->m_collisionDisabledObjects.findLinearSearch(rigidCollisionObject)==softBody->m_collisionDisabledObjects.size())
+ {
+ softBody->defaultCollisionHandler(rigidCollisionObject);
+ }
}
Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/SND_Utils.h
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/SND_Utils.h 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/SND_Utils.h 2008-10-17 19:17:45 UTC (rev 17097)
@@ -97,8 +97,8 @@
extern unsigned int SND_GetNumberOfChannels(void* sample);
extern unsigned int SND_GetSampleRate(void* sample);
extern unsigned int SND_GetBitRate(void* sample);
-extern unsigned int SND_GetNumberOfSamples(void* sample);
-extern unsigned int SND_GetHeaderSize(void* sample);
+extern unsigned int SND_GetNumberOfSamples(void* sample, int sample_length);
+extern unsigned int SND_GetHeaderSize(void* sample, int sample_length);
extern unsigned int SND_GetExtraChunk(void* sample);
extern void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot);
Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/fmod/SND_FmodDevice.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/fmod/SND_FmodDevice.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/fmod/SND_FmodDevice.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -162,7 +162,7 @@
int numberofchannels = SND_GetNumberOfChannels(memlocation);
int samplerate = SND_GetSampleRate(memlocation);
int bitrate = SND_GetBitRate(memlocation);
- int numberofsamples = SND_GetNumberOfSamples(memlocation);
+ int numberofsamples = SND_GetNumberOfSamples(memlocation, size);
waveslot->SetFileSize(size);
waveslot->SetData(memlocation);
Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Scene.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Scene.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Scene.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -388,11 +388,18 @@
#endif
#ifdef USE_OPENAL
// ok, properties Set. now see if it must play
- if (pObject->GetPlaystate() == SND_MUST_PLAY)
- {
+ switch (pObject->GetPlaystate()){
+ case SND_MUST_PLAY:
m_audiodevice->PlayObject(id);
pObject->SetPlaystate(SND_PLAYING);
- //break;
+ break;
+ case SND_MUST_STOP:
+ RemoveActiveObject(pObject);
+ break;
+ case SND_MUST_PAUSE:
+ m_audiodevice->PauseObject(id);
+ pObject->SetPlaystate(SND_PAUSED);
+ break;
}
#endif
Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_SoundObject.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_SoundObject.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_SoundObject.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -91,21 +91,24 @@
void SND_SoundObject::StartSound()
{
- m_playstate = SND_MUST_PLAY;
+ if (m_id >= 0)
+ m_playstate = SND_MUST_PLAY;
}
void SND_SoundObject::StopSound()
{
- m_playstate = SND_MUST_STOP;
+ if (m_id >= 0)
+ m_playstate = SND_MUST_STOP;
}
void SND_SoundObject::PauseSound()
{
- m_playstate = SND_MUST_PAUSE;
+ if (m_id >= 0)
+ m_playstate = SND_MUST_PAUSE;
}
Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Utils.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Utils.cpp 2008-10-17 19:06:24 UTC (rev 17096)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Utils.cpp 2008-10-17 19:17:45 UTC (rev 17097)
@@ -285,26 +285,32 @@
/* gets the length of the actual sample data (without the header) */
-unsigned int SND_GetNumberOfSamples(void* sample)
+unsigned int SND_GetNumberOfSamples(void* sample, int sample_length)
{
- unsigned int chunklength, length = 0, offset = 16;
- char data[4];
-
+ unsigned int chunklength, length = 0, offset;
+ unsigned short block_align;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list