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)
1  2 
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h

Simple merge