Cycles: svn merge -r36747:36777 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 12:37:26 +0000 (12:37 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 12:37:26 +0000 (12:37 +0000)
commit2e66cb520c5e41b83665119a9787e9839ce7c2b3
treedb75460ffa969f715dceafebf95a8c0acd0c73d3
parent74cccd1566e0e82a0f34d3ea1cab449cecfcbfd5
parente088f592bd82f5c3863368f49eabd3e8afffe119
Cycles: svn merge -r36747:36777 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_space.c