diff options
author | Thomas Dinges <blender@dingto.org> | 2013-02-04 21:01:42 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-02-04 21:01:42 +0400 |
commit | fd2934b73a644ae92dd9596b81c1a80ea6126060 (patch) | |
tree | 74eadca6c454cb8e55e480b937e1a119fee7a780 /intern | |
parent | a6f5a729fcd4e2686f955c8029818f0e92f8c8a2 (diff) |
Fix for [#34110] Displacement modifier + Procedural texture + Cycles -> 'NoneType' object has no attribute 'texture_mapping'
* Issue was caused by a remaining part from the "OUTPUT_TEXTURE" node UI code, from the original Cycles branch.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index ad9253fd68b..5e5f9b03e2c 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -850,24 +850,8 @@ class CyclesTexture_PT_context(CyclesButtonsPanel, Panel): split = layout.split(percentage=0.2) split.label(text="Type:") split.prop(tex, "type", text="") - - -class CyclesTexture_PT_nodes(CyclesButtonsPanel, Panel): - bl_label = "Nodes" - bl_context = "texture" - - @classmethod - def poll(cls, context): - tex = context.texture - return (tex and tex.use_nodes) and CyclesButtonsPanel.poll(context) - - def draw(self, context): - layout = self.layout - - tex = context.texture - panel_node_draw(layout, tex, 'OUTPUT_TEXTURE', 'Color') - - + + class CyclesTexture_PT_node(CyclesButtonsPanel, Panel): bl_label = "Node" bl_context = "texture" @@ -893,12 +877,11 @@ class CyclesTexture_PT_mapping(CyclesButtonsPanel, Panel): def poll(cls, context): tex = context.texture node = context.texture_node - return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context) + return node and CyclesButtonsPanel.poll(context) def draw(self, context): layout = self.layout - - # tex = context.texture + node = context.texture_node mapping = node.texture_mapping |