svn merge ^/trunk/blender -r43443:43461
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 17:08:32 +0000 (17:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 17:08:32 +0000 (17:08 +0000)
commit47b9f5d8f83e330342fd22c5b56b2623bde06d8c
tree0446fc03fdfbc2d34c1fbfb1c80bb7ccae286675
parentb805334cc283ea0126f81078830a3d6dcea97e40
parenta8081c1d2bb9115833493b011bb93d6c08112b2d
svn merge ^/trunk/blender -r43443:43461
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/mesh/loopcut.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform_conversions.c
source/creator/CMakeLists.txt