Merging r42896 through r42944 from trunk into soc-2911-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Dec 2011 18:31:32 +0000 (18:31 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Dec 2011 18:31:32 +0000 (18:31 +0000)
commitc2ae77e5bdd60e4cfe9b1f9d3d54e66f8089245c
tree505b5270122ec50302f6f824088b43318d13a296
parentfd134927dd23047237c6e490c09454487ba19a4a
parentfe2131367b3f1ca1f974d1d6160cfc8a1a220abe
Merging r42896 through r42944 from trunk into soc-2911-tomato
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_constraint_types.h