svn merge -r41638:41648 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 01:50:22 +0000 (01:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 01:50:22 +0000 (01:50 +0000)
commit130b4429b0279b8be8afa3ce45e60a359b723add
tree8b72d8827d499b74b71e24151844379c96f7e2ba
parent0811236da2d5c709e274d9442fd6fbda471c2136
parente06f206450b634737e3d2b310d1c702a994f28fe
svn merge -r41638:41648 ^/trunk/blender
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/armature/reeb.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_generics.c