svn merge ^/trunk/blender -r42670:42680
authorCampbell Barton <ideasman42@gmail.com>
Sat, 17 Dec 2011 02:41:53 +0000 (02:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 17 Dec 2011 02:41:53 +0000 (02:41 +0000)
commit5c6ee6b523c6a53c310683a9f7fbe5d730db6122
tree65e90096612cac887a47ef19d27551e2e0b1cac1
parentdb6cb30941da7899ccafa44c87c17970d134a2c9
parent994f4bb3f78a467b6c34e30a9b8868fc4d01caf0
svn merge ^/trunk/blender -r42670:42680
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/edgehash.c
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_orientations.c