[Bf-blender-cvs] [74518b6] master: Fix failing script_load_addons test after recent code cleanup.

[Brecht Van Lommel]

Commit: 74518b6e88d4737c28e80e11beccd1e604962dd7
Author: Brecht Van Lommel
Date:   Wed Jul 6 21:43:55 2016 +0200
Branches: master
https://developer.blender.org/rB74518b6e88d4737c28e80e11beccd1e604962dd7

Fix failing script_load_addons test after recent code cleanup.

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

M	intern/cycles/blender/addon/ui.py

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e597e45..1201994 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1712,10 +1712,10 @@ def get_panels():
         }
 
     panels = []
-    for t in bpy.types.Panel.__subclasses__():
-        if hasattr(t, 'COMPAT_ENGINES') and 'BLENDER_RENDER' in t.COMPAT_ENGINES:
-            if t.__name__ not in exclude_panels:
-                panels.append(t)
+    for panel in bpy.types.Panel.__subclasses__():
+        if hasattr(panel, 'COMPAT_ENGINES') and 'BLENDER_RENDER' in panel.COMPAT_ENGINES:
+            if panel.__name__ not in exclude_panels:
+                panels.append(panel)
 
     return panels
 
@@ -1726,10 +1726,10 @@ def register():
     for panel in get_panels():
         panel.COMPAT_ENGINES.add('CYCLES')
 
-
 def unregister():
     bpy.types.RENDER_PT_render.remove(draw_device)
     bpy.types.VIEW3D_HT_header.remove(draw_pause)
 
     for panel in get_panels():
-        panel.COMPAT_ENGINES.remove('CYCLES')
+        if 'CYCLES' in panel.COMPAT_ENGINES:
+            panel.COMPAT_ENGINES.remove('CYCLES')