svn merge ^/trunk/blender -r47184:47201
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 04:48:10 +0000 (04:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 04:48:10 +0000 (04:48 +0000)
commit766307e3119fb805c7050a7c1d363ec26e564a21
treee5b2ec251e837927bf0480ff2549d6a7905d2d9e
parent8284b8a56def7d170443370cb3c65fa107c00c65
parentf5011d3aaafb9a3f5caf1872e1390c3aec9e349f
svn merge ^/trunk/blender -r47184:47201
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c