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
path: root/intern
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-14 19:58:12 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2018-12-14 21:01:22 +0300
commitac68f44b8a0cb5926af2977721fc01cb4eb8e1b7 (patch)
tree83916ff499c32a69c75e523e3435573204526b35 /intern
parentccc09ec124638f9aca0ba0f33e3b4cb22b023960 (diff)
fix shader editor errors when showing world shader tree
probably an oversight in rBd40bffa17f6d Reviewers: brecht Differential Revision: https://developer.blender.org/D4079
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 114aa45ffa3..8e57d3a0c2f 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1980,7 +1980,8 @@ class CYCLES_NODE_PT_settings(CyclesNodeButtonsPanel, Panel):
def poll(cls, context):
snode = context.space_data
return CyclesNodeButtonsPanel.poll(context) and \
- snode.tree_type == 'ShaderNodeTree' and snode.id
+ snode.tree_type == 'ShaderNodeTree' and snode.id and \
+ snode.id.bl_rna.identifier == 'Material'
def draw(self, context):
material = context.space_data.id