[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57915] branches/soc-2013-dingto/intern/ cycles/blender/addon/ui.py: Cycles UI script:

[Thomas Dinges]

Revision: 57915
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57915
Author:   dingto
Date:     2013-07-01 21:30:45 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Cycles UI script:
* Fix a merge error, device_type was not defined anymore after Non-Progressive integrator changes for GPU. 

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py

Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-07-01 21:25:19 UTC (rev 57914)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-07-01 21:30:45 UTC (rev 57915)
@@ -51,6 +51,7 @@
 
         scene = context.scene
         cscene = scene.cycles
+        device_type = context.user_preferences.system.compute_device_type
 
         split = layout.split()