diff options
Diffstat (limited to 'release/scripts/freestyle/modules/parameter_editor.py')
| -rw-r--r-- | release/scripts/freestyle/modules/parameter_editor.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py index b093920a4cb..c2b23f017fe 100644 --- a/release/scripts/freestyle/modules/parameter_editor.py +++ b/release/scripts/freestyle/modules/parameter_editor.py @@ -1206,7 +1206,7 @@ integration_types = { # main function for parameter processing def process(layer_name, lineset_name): scene = getCurrentScene() - layer = scene.render.layers[layer_name] + layer = scene.view_layers[layer_name] lineset = layer.freestyle_settings.linesets[lineset_name] linestyle = lineset.linestyle @@ -1538,16 +1538,9 @@ def process(layer_name, lineset_name): raise RuntimeError("No Thickness modifier with type", type(m), m) # -- Textures -- # has_tex = False - if scene.render.use_shading_nodes: - if linestyle.use_nodes and linestyle.node_tree: - shaders_list.append(BlenderTextureShader(linestyle.node_tree)) - has_tex = True - else: - if linestyle.use_texture: - textures = tuple(BlenderTextureShader(slot) for slot in linestyle.texture_slots if slot is not None) - if textures: - shaders_list.extend(textures) - has_tex = True + if linestyle.use_nodes and linestyle.node_tree: + shaders_list.append(BlenderTextureShader(linestyle.node_tree)) + has_tex = True if has_tex: shaders_list.append(StrokeTextureStepShader(linestyle.texture_spacing)) |