Andre Susano Pinto 656ee61718 Merge from trunk ...

(The last time there was some files missing due to failed connection to svn server while merging.. thats why this stuff of reverting last merge and redoing it)

svn merge -r 16231:16608 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-09-19 14:15:36 +00:00

..

BL_ActionActuator.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_ActionActuator.h

svn merge -r 15392:15551 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-07-13 13:21:01 +00:00

BL_ArmatureObject.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_ArmatureObject.h

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_BlenderDataConversion.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_BlenderDataConversion.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

BL_DeformableGameObject.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_DeformableGameObject.h

svn merge -r 15590:15688 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-07-22 12:02:57 +00:00

BL_MeshDeformer.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_MeshDeformer.h

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_ShapeActionActuator.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_ShapeActionActuator.h

svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-01 21:37:36 +00:00

BL_ShapeDeformer.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_ShapeDeformer.h

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_SkinDeformer.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_SkinDeformer.h

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_SkinMeshObject.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

BL_SkinMeshObject.h

Merge from trunk

2008-09-19 14:15:36 +00:00

BlenderWorldInfo.cpp

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

BlenderWorldInfo.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

CMakeLists.txt

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_BlenderScalarInterpolator.cpp

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_BlenderScalarInterpolator.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_BlenderSceneConverter.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_BlenderSceneConverter.h

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_ConvertActuators.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_ConvertActuators.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_ConvertControllers.cpp

svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-06-30 22:57:52 +00:00

KX_ConvertControllers.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_ConvertProperties.cpp

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_ConvertProperties.h

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

KX_ConvertSensors.cpp

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_ConvertSensors.h

Merge from trunk

2008-09-19 14:15:36 +00:00

KX_IpoConvert.cpp

svn merge -r 15908:15988 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-06 16:50:07 +00:00

KX_IpoConvert.h

svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-01 21:37:36 +00:00

Makefile

Merge from trunk

2008-09-19 14:15:36 +00:00

SConscript

Merge from trunk

2008-09-19 14:15:36 +00:00