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)
1  2 
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