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)
1  2 
source/blender/blenkernel/intern/tracking.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_tracking.c