Cycles UI script: * Fix a merge error, device_type was not defined anymore after Non-Progressive integrator changes for GPU. 
Cycles UI script:
* Fix a merge error, device_type was not defined anymore after Non-Progressive integrator changes for GPU. 

tangent-opensource/coreBlackbird,pyrochlore/cycles,pyrochlore/cycles,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,pyrochlore/cycles