Merging r42770 through r42799 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Dec 2011 14:50:05 +0000 (14:50 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Dec 2011 14:50:05 +0000 (14:50 +0000)
commit9774c93435700217549d9851f4d937dbeae5b4ba
tree75ae6ae34e6348c537017fbf7335dd420addc5e1
parent921b2ee2d44ed87363198d7bfa89bb7116b0818b
parent2777ba097f5404a736333239bb6d61ab4b561e13
Merging r42770 through r42799 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c