Merging r42723 through r42769 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Dec 2011 17:24:20 +0000 (17:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Dec 2011 17:24:20 +0000 (17:24 +0000)
commit921b2ee2d44ed87363198d7bfa89bb7116b0818b
tree3e04fd777b5c32f4814357ff9d18289ee072c962
parent1dc74acc123721d366e3628663ed029db5761e4d
parent738fdc7b6f43c3e1e838bd4239b36340fa4c2e0f
Merging r42723 through r42769 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c