svn merge ^/trunk/blender -r49757:49763
authorCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 10:37:31 +0000 (10:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 10:37:31 +0000 (10:37 +0000)
commitbfbea032286d0596ac70ccff576d598387177b26
tree7fc6a47df5c0b5b9ffc6742043a9f70e060edf6e
parent6129a0f97cdd35ad1badf4e53c72d31a91cd0717
parent6a1a5ad08b593953ab0ada04b2883687e85bb744
svn merge ^/trunk/blender -r49757:49763
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h