Remove default sampler from Texture

[libs/gl.git] / blender / io_mspgl / material.py

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index 2613edac67478dae4d4ef57a1c537bc6af487bd8..1d6a06a0b0730974365d21e65a3f19760b566bea 100644 (file)
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -1,14 +1,8 @@
 import os
 
-def get_linked_node_and_socket(node_tree, socket):
-       for l in node_tree.links:
-               if socket==l.to_socket:
-                       return (l.from_node, l.from_socket)
-               elif socket==l.from_socket:
-                       return (l.to_node, l.to_socket)
-       return (None, None)
-
 def check_group(node_tree, group, func):
+       from .util import get_linked_node_and_socket
+
        output = group.node_tree.nodes["Group Output"]
        from_node, _ = get_linked_node_and_socket(group.node_tree, output.inputs[0])
        if from_node:
@@ -23,6 +17,8 @@ def check_invert_green(node_tree, node):
        elif node.type!='COMBRGB':
                return (None, None)
 
+       from .util import get_linked_node_and_socket
+
        green, g_sock = get_linked_node_and_socket(node_tree, node.inputs["G"])
        if not green or green.type!='MATH' or green.operation!='SUBTRACT':
                return (None, None)
@@ -55,6 +51,8 @@ class MaterialProperty:
                                self.value = input_socket.default_value
 
                if self.tex_keyword:
+                       from .util import get_linked_node_and_socket
+
                        from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
                        alpha_from = None
                        if from_node:
@@ -98,21 +96,19 @@ class Material:
                self.shader = material.shader
                self.receive_shadows = material.receive_shadows
                self.cast_shadows = (material.shadow_method!='NONE')
+               self.image_based_lighting = material.image_based_lighting
 
                if self.render_mode=='EXTERNAL' and not self.technique:
                        raise Exception("Invalid configuration on material {}: No technique for external rendering".format(self.name))
                elif self.render_mode=='CUSTOM' and not self.shader:
                        raise Exception("Invalid configuration on material {}: No shader for custom rendering".format(self.name))
 
-               out_node = None
-               for n in material.node_tree.nodes:
-                       if n.type=='OUTPUT_MATERIAL':
-                               out_node = n
-                               break
-
+               out_node = next((n for n in material.node_tree.nodes if n.type=='OUTPUT_MATERIAL'), None)
                if not out_node:
                        raise Exception("No output node found on material {}".format(self.name))
 
+               from .util import get_linked_node_and_socket
+
                surface_node, _ = get_linked_node_and_socket(material.node_tree, out_node.inputs["Surface"])
                if not surface_node:
                        if self.render_mode=='BUILTIN':
@@ -144,7 +140,7 @@ class Material:
                sampler_settings = None
                for p in self.properties:
                        if p.texture:
-                               settings = (p.texture.default_filter, p.texture.interpolation, p.texture.use_mipmap, p.texture.max_anisotropy)
+                               settings = (p.texture.interpolation, p.texture.use_mipmap, p.texture.max_anisotropy)
                                if sampler_settings is None:
                                        sampler_settings = settings
                                elif settings!=sampler_settings: