Merge branch 'blender-v3.0-release'

2021-11-01 13:39:24 +01:00
parent 7150f919d3 f85c58ab65
commit 6897c2141e
1 changed files with 1 additions and 1 deletions
--- 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