Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-07-02 01:30:45 +0400
committerThomas Dinges <blender@dingto.org>2013-07-02 01:30:45 +0400
commit8c9769c18d3b5a6167f781d7008b83c772a74a1c (patch)
tree0ca3e589b5ec938986bf1e77e3117cc04500f0d5 /intern
parent465a7195b4b2e0e26889aed640f26443e061516e (diff)
Cycles UI script:
* Fix a merge error, device_type was not defined anymore after Non-Progressive integrator changes for GPU.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index b52a2c53f87..b80ab6b1c5e 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -51,6 +51,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
+ device_type = context.user_preferences.system.compute_device_type
split = layout.split()