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)
1  2 
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/intern/rna_space.c