svn merge ^/trunk/blender -r43830:43864
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Feb 2012 01:30:21 +0000 (01:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Feb 2012 01:30:21 +0000 (01:30 +0000)
commit075fee4d58a65b4313bb7e984ae195690f4c7bfd
treee801da2591eda34a4c4c7fd5436ff476353b1c55
parent68cc7e168207c4c519f54f7e0f7f638768386cd0
parent050963b6a9529e0abdd597d163ddc4343c0b15c2
svn merge ^/trunk/blender -r43830:43864
CMakeLists.txt
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/navmesh_conversion.c
source/blender/collada/GeometryExporter.cpp
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform_conversions.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/gameengine/Ketsji/KX_NavMeshObject.cpp