svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
authorCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 23:42:22 +0000 (23:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 23:42:22 +0000 (23:42 +0000)
commit0b3fd395ef3c6d9f3a83712abe2903cb661e94eb
tree5b40726d5a0def595cfbf2b397817b257387c12c
parentfe850bd1637b9d0efd28cfcc648903172d7b9303
parent0949d48d25efdb703e7b411b4403f3cdf0eb5308
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
16 files changed:
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Expressions/Value.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.h