Merged revision(s) 58785-58855 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sat, 3 Aug 2013 12:49:08 +0000 (12:49 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 3 Aug 2013 12:49:08 +0000 (12:49 +0000)
commitb84858778c86feebf5a68d136d670a3bb15736e6
treec80f3145eeb4de333cb33e093759aca14d2655f5
parent745ec9766ee614bd65d5a08001cb3bc14de69a85
parent66a40779271b55498216cc14b4df3ca8d575137c
Merged revision(s) 58785-58855 from trunk/blender into soc-2013-dingto.
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp