Merged revision(s) 58424-58448 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:46:49 +0000 (15:46 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:46:49 +0000 (15:46 +0000)
commit19b5fc17dc33cf9b6ef4cadab945d481ba634e5c
treee5d63f7f7661618a4393b3dace0c219d2e741b63
parent715855d0b97cc1fa51031aea6393aa89f89b2d65
parent49c61e169bb4114b63d99d842c27d533b8733f82
Merged revision(s) 58424-58448 from trunk/blender into soc-2013-dingto

Had to resolve manual conflict in addon/ui.py and blender/blender_sync.cpp due to Non-Progressive integrator, which is enabled in my branch.
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cpu.cpp