svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 08:28:16 +0000 (08:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 08:28:16 +0000 (08:28 +0000)
commit0383fb53414366d4ede19622fbe5bb5e6f782a0f
treef9137000aeb86b710773e41743671e70f44b4463
parent75b393612809252349bf4062bc45df14c1a5dfe5
parentff04beb3e4681e6849030595c80ed692c3bd9be1
svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/util/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/CMakeLists.txt