Merging r46111 through r46136 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 1 May 2012 09:17:22 +0000 (09:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 1 May 2012 09:17:22 +0000 (09:17 +0000)
commit4413e0472d55c979777a9c5b7a9bb95497cbaa84
tree425875d1528f51cb9422c3389efc29ee93ae1e8a
parentc8b863288fdd26e049bd38fdec110da116e8579d
parent9fe1fe0aa8a82ff59932db40b36ff46644297f0b
Merging r46111 through r46136 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h