svn merge ^/trunk/blender -r49118:49143
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 15:03:54 +0000 (15:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 15:03:54 +0000 (15:03 +0000)
commitad4738e77f53e99edc8fbba0472b3437aa318e90
tree891e398a52074db3e46a7aab96543e767d39e921
parentb25d28df18059b3494a3ab2569ef5444eca1135d
parent5412389af61f55d4e6a8ff271df01411b195e659
svn merge ^/trunk/blender -r49118:49143
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_userdef.c