svn merge ^/trunk/blender -r46979:47003
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2012 09:42:58 +0000 (09:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2012 09:42:58 +0000 (09:42 +0000)
commit5ed2e0d5bcbc7b0d10503dda1139332a5d84fdef
treed178bf503187bb6c8282b0e8c5de346a8f67db36
parent139c92e7eb69ba03441faeb7e67b84d60488a199
parent19dd66cf3b0108c0a74d7626b31c1b8cb9dd57fe
svn merge ^/trunk/blender -r46979:47003
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_space.c