Merging r46074 through r46095 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 06:55:03 +0000 (06:55 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 06:55:03 +0000 (06:55 +0000)
commit16f06d4fe4bc9317a505a15112d7250152aa36d0
tree20f2981b361561ea4f19fdcc6af6afdcf321c87b
parentebe4ffa8de3c0a2d471e6f859e96921fe95b475b
parent0f4966164ab9cd64d2b8c676615d16bcda1064dd
Merging r46074 through r46095 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c