From fe2b4613985f2e3914a7e54a1abe70a43871905d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 16 Aug 2014 22:42:02 +0200 Subject: Fix poll func of CYCLES_OT_use_shading_nodes. Operators' poll func might be called from anywhere in Blender, so they should not make any assumption about available context. material, lamp and world are specific to context from Properties space... --- intern/cycles/blender/addon/ui.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 4a13f265d14..057b59264a4 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -629,7 +629,8 @@ class CYCLES_OT_use_shading_nodes(Operator): @classmethod def poll(cls, context): - return context.material or context.world or context.lamp + return (getattr(context, "material", False) or getattr(context, "world", False) or + getattr(context, "lamp", False)) def execute(self, context): if context.material: -- cgit v1.2.3