svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorBenoit Bolsee <benoit.bolsee@online.be>
Tue, 7 Jun 2011 21:20:25 +0000 (21:20 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Tue, 7 Jun 2011 21:20:25 +0000 (21:20 +0000)
1  2 
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c