[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16845] branches/soc-2008-unclezeiv: svn merge -r 16780:16842 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Tue Sep 30 11:27:39 CEST 2008
Revision: 16845
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16845
Author: unclezeiv
Date: 2008-09-30 11:27:37 +0200 (Tue, 30 Sep 2008)
Log Message:
-----------
svn merge -r 16780:16842 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/CMakeLists.txt
branches/soc-2008-unclezeiv/bin/.blender/.Blanguages
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2008-unclezeiv/extern/fftw/SConscript
branches/soc-2008-unclezeiv/extern/fftw/config.h
branches/soc-2008-unclezeiv/intern/SoundSystem/intern/SND_Utils.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_control.cpp
branches/soc-2008-unclezeiv/po/Makefile
branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2008-unclezeiv/release/scripts/collada_export.py
branches/soc-2008-unclezeiv/release/scripts/hotkeys.py
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_ipo.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_object.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/armature.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/collision.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/curve.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/displist.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/arithb.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/bpath.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/psfont.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c
branches/soc-2008-unclezeiv/source/blender/blenloader/BLO_soundfile.h
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
branches/soc-2008-unclezeiv/source/blender/include/BDR_editobject.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_editmesh.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_editparticle.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_retopo.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Armature.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Draw.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Geometry.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Group.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/IDProp.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Ipo.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Mesh.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/NMesh.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Scene.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Sys.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Window.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/bpy_data.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/constant.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Geometry.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/matrix.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2008-unclezeiv/source/blender/radiosity/intern/source/radfactors.c
branches/soc-2008-unclezeiv/source/blender/radiosity/intern/source/radnode.c
branches/soc-2008-unclezeiv/source/blender/radiosity/intern/source/radpreprocess.c
branches/soc-2008-unclezeiv/source/blender/render/intern/include/pixelshading.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/sunsky.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/initrender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/occlusion.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pipeline.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rayshade.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/sunsky.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/texture.c
branches/soc-2008-unclezeiv/source/blender/src/CMakeLists.txt
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/drawarmature.c
branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/drawtext.c
branches/soc-2008-unclezeiv/source/blender/src/drawview.c
branches/soc-2008-unclezeiv/source/blender/src/edit.c
branches/soc-2008-unclezeiv/source/blender/src/editcurve.c
branches/soc-2008-unclezeiv/source/blender/src/editface.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_add.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_loop.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_tools.c
branches/soc-2008-unclezeiv/source/blender/src/editobject.c
branches/soc-2008-unclezeiv/source/blender/src/editparticle.c
branches/soc-2008-unclezeiv/source/blender/src/editsima.c
branches/soc-2008-unclezeiv/source/blender/src/editsound.c
branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
branches/soc-2008-unclezeiv/source/blender/src/meshtools.c
branches/soc-2008-unclezeiv/source/blender/src/parametrizer.c
branches/soc-2008-unclezeiv/source/blender/src/poseobject.c
branches/soc-2008-unclezeiv/source/blender/src/retopo.c
branches/soc-2008-unclezeiv/source/blender/src/sculptmode.c
branches/soc-2008-unclezeiv/source/blender/src/seqaudio.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/toets.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/transform_ndofinput.c
branches/soc-2008-unclezeiv/source/blender/src/unwrapper.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/blender/src/vpaint.c
branches/soc-2008-unclezeiv/source/creator/CMakeLists.txt
branches/soc-2008-unclezeiv/source/creator/creator.c
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/po/ko.po
branches/soc-2008-unclezeiv/release/scripts/export_dxf.py
Removed Paths:
-------------
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/
branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/kr/
branches/soc-2008-unclezeiv/po/kr.po
Modified: branches/soc-2008-unclezeiv/CMakeLists.txt
===================================================================
--- branches/soc-2008-unclezeiv/CMakeLists.txt 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/CMakeLists.txt 2008-09-30 09:27:37 UTC (rev 16845)
@@ -327,7 +327,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
Modified: branches/soc-2008-unclezeiv/bin/.blender/.Blanguages
===================================================================
--- branches/soc-2008-unclezeiv/bin/.blender/.Blanguages 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/bin/.blender/.Blanguages 2008-09-30 09:27:37 UTC (rev 16845)
@@ -20,4 +20,4 @@
Arabic:ar
Bulgarian:bg
Greek:el
-Korean:kr
+Korean:ko
Copied: branches/soc-2008-unclezeiv/bin/.blender/locale/ko (from rev 16842, trunk/blender/bin/.blender/locale/ko)
Copied: branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES (from rev 16842, trunk/blender/bin/.blender/locale/ko/LC_MESSAGES)
Deleted: branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Copied: branches/soc-2008-unclezeiv/bin/.blender/locale/ko/LC_MESSAGES/blender.mo (from rev 16842, trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo)
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp 2008-09-30 09:27:37 UTC (rev 16845)
@@ -17,7 +17,9 @@
#include "btCollisionObject.h"
btCollisionObject::btCollisionObject()
- : m_broadphaseHandle(0),
+ : m_anisotropicFriction(1.f,1.f,1.f),
+ m_hasAnisotropicFriction(false),
+ m_broadphaseHandle(0),
m_collisionShape(0),
m_rootCollisionShape(0),
m_collisionFlags(btCollisionObject::CF_STATIC_OBJECT),
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h 2008-09-30 09:27:37 UTC (rev 16845)
@@ -49,6 +49,9 @@
//without destroying the continuous interpolated motion (which uses this interpolation velocities)
btVector3 m_interpolationLinearVelocity;
btVector3 m_interpolationAngularVelocity;
+ btVector3 m_anisotropicFriction;
+ bool m_hasAnisotropicFriction;
+
btBroadphaseProxy* m_broadphaseHandle;
btCollisionShape* m_collisionShape;
@@ -119,7 +122,21 @@
return ((m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OBJECT | CF_NO_CONTACT_RESPONSE) )==0);
}
+ const btVector3& getAnisotropicFriction() const
+ {
+ return m_anisotropicFriction;
+ }
+ void setAnisotropicFriction(const btVector3& anisotropicFriction)
+ {
+ m_anisotropicFriction = anisotropicFriction;
+ m_hasAnisotropicFriction = (anisotropicFriction[0]!=1.f) || (anisotropicFriction[1]!=1.f) || (anisotropicFriction[2]!=1.f);
+ }
+ bool hasAnisotropicFriction() const
+ {
+ return m_hasAnisotropicFriction;
+ }
+
SIMD_FORCE_INLINE bool isStaticObject() const {
return (m_collisionFlags & CF_STATIC_OBJECT) != 0;
}
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp 2008-09-30 09:27:37 UTC (rev 16845)
@@ -149,6 +149,7 @@
solverBody->m_originalBody = 0;
solverBody->m_angularFactor = 1.f;
}
+
solverBody->m_pushVelocity.setValue(0.f,0.f,0.f);
solverBody->m_turnVelocity.setValue(0.f,0.f,0.f);
}
@@ -292,7 +293,7 @@
return normalImpulse;
}
-
+//#define NO_FRICTION_TANGENTIALS 1
#ifndef NO_FRICTION_TANGENTIALS
btScalar resolveSingleFrictionCacheFriendly(
@@ -396,7 +397,7 @@
return 0.f;
- body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
+ body1.getVelocityInLocalPoint(contactConstraint.m_relpos1CrossNormal,vel1);
body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
btVector3 vel = vel1 - vel2;
btScalar rel_vel;
@@ -421,9 +422,9 @@
(body1.m_invMass + body2.m_invMass + lat_vel.dot(temp1.cross(rel_pos1) + temp2.cross(rel_pos2)));
btScalar normal_impulse = contactConstraint.m_appliedImpulse * combinedFriction;
- GEN_set_min(friction_impulse, normal_impulse);
- GEN_set_max(friction_impulse, -normal_impulse);
- body1.applyImpulse(lat_vel * -friction_impulse, rel_pos1);
+ btSetMin(friction_impulse, normal_impulse);
+ btSetMin(friction_impulse, -normal_impulse);
+ body1.internalApplyImpulse(lat_vel * -friction_impulse, rel_pos1);
body2.applyImpulse(lat_vel * friction_impulse, rel_pos2);
}
}
@@ -495,7 +496,24 @@
}
+void applyAnisotropicFriction(btCollisionObject* colObj,btVector3& frictionDirection);
+void applyAnisotropicFriction(btCollisionObject* colObj,btVector3& frictionDirection)
+{
+ if (colObj && colObj->hasAnisotropicFriction())
+ {
+ // transform to local coordinates
+ btVector3 loc_lateral = frictionDirection * colObj->getWorldTransform().getBasis();
+ const btVector3& friction_scaling = colObj->getAnisotropicFriction();
+ //apply anisotropic friction
+ loc_lateral *= friction_scaling;
+ // ... and transform it back to global coordinates
+ frictionDirection = colObj->getWorldTransform().getBasis() * loc_lateral;
+ }
+}
+
+
+
btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** /*bodies */,int /*numBodies */,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
{
BT_PROFILE("solveGroupCacheFriendlySetup");
@@ -755,19 +773,31 @@
if (!cp.m_lateralFrictionInitialized)
{
cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+
+ //scale anisotropic friction
+
+ applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir1);
+ applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir1);
+
btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+
+
if (lat_rel_vel > SIMD_EPSILON)//0.0f)
{
cp.m_lateralFrictionDir1 /= btSqrt(lat_rel_vel);
addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
- cp.m_lateralFrictionDir2.normalize();//??
+ cp.m_lateralFrictionDir2.normalize();
+ applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir2);
+ applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir2);
+
addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
} else
{
//re-calculate friction direction every frame, todo: check if this is really needed
-
btPlaneSpace1(cp.m_normalWorldOnB,cp.m_lateralFrictionDir1,cp.m_lateralFrictionDir2);
+ applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir2);
+ applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir2);
addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
}
Modified: branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-09-30 09:27:37 UTC (rev 16845)
@@ -45,6 +45,7 @@
m_linearVelocity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
m_angularFactor = btScalar(1.);
+ m_anisotropicFriction.setValue(1.f,1.f,1.f);
m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
Modified: branches/soc-2008-unclezeiv/extern/fftw/SConscript
===================================================================
--- branches/soc-2008-unclezeiv/extern/fftw/SConscript 2008-09-30 09:22:11 UTC (rev 16844)
+++ branches/soc-2008-unclezeiv/extern/fftw/SConscript 2008-09-30 09:27:37 UTC (rev 16845)
@@ -3,11 +3,21 @@
Import('env')
-sources = env.Glob('api/*.c') + env.Glob('kernel/*.c') + env.Glob('dft/*.c') + env.Glob('rdft/*.c') + env.Glob('reodft/*.c')
-sources += env.Glob('dft/codelets/*.c') + env.Glob('dft/codelets/standard/*.c')
-sources += env.Glob('rdft/codelets/*.c') + env.Glob('rdft/codelets/hc2r/*.c') + env.Glob('rdft/codelets/r2hc/*.c') + env.Glob('rdft/codelets/r2r/*.c')
defs = []
cflags = []
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list