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 <brechtvanlommel@gmail.com>2016-07-06 22:43:55 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-07-06 22:57:53 +0300
commit74518b6e88d4737c28e80e11beccd1e604962dd7 (patch)
tree6f51518da11219e99d79af754f0327ee71c97066
parent04b3d682bbfaba08d66efef326a55bf4a00d1e3c (diff)
Fix failing script_load_addons test after recent code cleanup.
-rw-r--r--intern/cycles/blender/addon/ui.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e597e45bd75..120199479fe 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')