svn merge ^/trunk/blender -r47603:47611
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2012 14:49:07 +0000 (14:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2012 14:49:07 +0000 (14:49 +0000)
commit511ee1175a9bcb45de68543f73c12b1ef8105632
tree8c4df4507d75b6c50288547d3ee87d3b94abc8af
parent26f9fe39628c16e2740ac85f4d21e7d0ee6f3d09
parent5f2409e5ec94fd180206879f9d3dc030bca8f6b8
svn merge ^/trunk/blender -r47603:47611
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/intern/rna_space.c