Merging r42482 through r42532 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Dec 2011 10:02:01 +0000 (10:02 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Dec 2011 10:02:01 +0000 (10:02 +0000)
commit3717a4a9e1ef159ce9b75738cd40122bbd01671b
treeaaa8c6affd659e4809156c58d82a16ff1ece359b
parentdbc9227a3247e2138f964b1687e3467f3f4b9741
parentf025b7b51159cf3cdf49e9ec0eeaf4427010e1f7
Merging r42482 through r42532 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/tracking.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_tracking.c