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)
commitb5bd86e5907c3fa98546dabeda9703dfb15862f4
treeeb65895e557f820fca0931c8465571ed0e749860
parent9de407f13f2e628f67dbcda252febebac6307293
parent7fd1fe9fc8e3154c36a57ed2c69409d526ee1171
svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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