[Bf-blender-cvs] [403f00e] master: Fix prefs UI when built w/o Cycles

Campbell Barton noreply at git.blender.org
Thu Nov 24 06:02:30 CET 2016


Commit: 403f00e558992dd040f9d13c142e28781f7cfe84
Author: Campbell Barton
Date:   Thu Nov 24 11:14:45 2016 +1100
Branches: master
https://developer.blender.org/rB403f00e558992dd040f9d13c142e28781f7cfe84

Fix prefs UI when built w/o Cycles

===================================================================

M	release/scripts/startup/bl_ui/space_userpref.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index bdbb633..e5b6a94 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -429,8 +429,11 @@ class USERPREF_PT_system(Panel):
 
         col.separator()
 
-        if userpref.addons.find('cycles') != -1:
-            userpref.addons['cycles'].preferences.draw_impl(col, context)
+        if bpy.app.build_options.cycles:
+            addon = userpref.addons.get("cycles")
+            if addon is not None:
+                addon.preferences.draw_impl(col, context)
+            del addon
 
         if hasattr(system, "opensubdiv_compute_type"):
             col.label(text="OpenSubdiv compute:")




More information about the Bf-blender-cvs mailing list