svn merge ^/trunk/blender -r46699:46714
authorCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 09:34:22 +0000 (09:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 09:34:22 +0000 (09:34 +0000)
commit37f6ed397d0a1ce238b61a9f6d1f9a4c9846a7d5
treea5209215c8da449ca96356964e41ddfd8571c699
parent0a917fa1c36f0544867297442f00216bf1021577
parentdfa075b66246f845a933611e768c638fb8c10bf5
svn merge ^/trunk/blender -r46699:46714
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_space.c