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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-11-01 15:39:24 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-11-01 15:39:24 +0300
commit6897c2141e028005b251214d6d5dc7fc8c3802b0 (patch)
tree1617c1524134cf3522749429547c65c622f73b01 /intern/cycles/blender
parent7150f919d3ca6638b6c0e0f2389b88f15db5f171 (diff)
parentf85c58ab65e55f6a8006fcc1140c73fe10c2c364 (diff)
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/addon/version_update.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 90ed8873c02..76bc765ec1d 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -100,7 +100,7 @@ def do_versions(self):
if bpy.context.preferences.version <= (3, 0, 40):
# Disable OpenCL device
prop = bpy.context.preferences.addons[__package__].preferences
- if prop['compute_device_type'] == 4:
+ if prop.is_property_set("compute_device_type") and prop['compute_device_type'] == 4:
prop.compute_device_type = 'NONE'
# We don't modify startup file because it assumes to