Merging r42533 through r42601 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2011 11:58:59 +0000 (11:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2011 11:58:59 +0000 (11:58 +0000)
commitb865c0314f4bd2ead240accff1d06234f614acd2
tree61026809a1b3bebb7b2f0614912d4e37267da897
parent3717a4a9e1ef159ce9b75738cd40122bbd01671b
parent5466befb38cf4ba21e4cf97f0318aaa7f2b10938
Merging r42533 through r42601 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c