[Bf-blender-cvs] [a05be009a5c] master: Cleanup: remove unused object_image_guess

Campbell Barton noreply at git.blender.org
Tue Oct 29 13:53:23 CET 2019


Commit: a05be009a5c4b8d1be4106e6e7679fbdddb4c2b5
Author: Campbell Barton
Date:   Tue Oct 29 23:41:17 2019 +1100
Branches: master
https://developer.blender.org/rBa05be009a5c4b8d1be4106e6e7679fbdddb4c2b5

Cleanup: remove unused object_image_guess

This made sense when we had tex-face feature,
since it's removed & unused, remove this function too.

D6079 by @alm

===================================================================

M	release/scripts/modules/bpy_extras/object_utils.py

===================================================================

diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 151cfa84f85..9db86782d02 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -24,7 +24,6 @@ __all__ = (
     "AddObjectHelper",
     "object_add_grid_scale",
     "object_add_grid_scale_apply_operator",
-    "object_image_guess",
     "world_to_camera_view",
 )
 
@@ -225,46 +224,6 @@ def object_add_grid_scale_apply_operator(operator, context):
                         getattr(operator, prop_id) * grid_scale)
 
 
-def object_image_guess(obj, bm=None):
-    """
-    Return a single image used by the object,
-    first checking the texture-faces, then the material.
-    """
-    # TODO, cycles/nodes materials
-    me = obj.data
-    if bm is None:
-        if obj.mode == 'EDIT':
-            import bmesh
-            bm = bmesh.from_edit_mesh(me)
-
-    if bm is not None:
-        tex_layer = bm.faces.layers.tex.active
-        if tex_layer is not None:
-            for f in bm.faces:
-                image = f[tex_layer].image
-                if image is not None:
-                    return image
-    else:
-        tex_layer = me.uv_textures.active
-        if tex_layer is not None:
-            for tf in tex_layer.data:
-                image = tf.image
-                if image is not None:
-                    return image
-
-    for m in obj.data.materials:
-        if m is not None:
-            # backwards so topmost are highest priority
-            for mtex in reversed(m.texture_slots):
-                if mtex and mtex.use_map_color_diffuse:
-                    texture = mtex.texture
-                    if texture and texture.type == 'IMAGE':
-                        image = texture.image
-                        if image is not None:
-                            return image
-    return None
-
-
 def world_to_camera_view(scene, obj, coord):
     """
     Returns the camera space coords for a 3d point.



More information about the Bf-blender-cvs mailing list