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)
1  2 
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

Simple merge