fixed [#23400] Unable to import *.3ds/*.obj files with textures

changed some rna names to be more consistant
- use_texture -> use_image, since it sets if 'image' is used.
- use_map_color_diff -> use_map_color_diffuse since diffuse is used elsewhere in the same type.

release/scripts/io/import_scene_3ds.py

@@ -364,7 +364,7 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH):
                         bmesh.faces[fidx].material_index = mat_idx
                         uf = uv_faces[fidx]
                         uf.image = img
-                        uf.tex = True
+                        uf.use_image = True
                 else:
                     for fidx in faces:
                         bmesh.faces[fidx].material_index = mat_idx

release/scripts/op/animsys_update.py

@@ -522,7 +522,7 @@ data_path_update = [
     ("MaterialTextureSlot", "from_original", "use_from_original"),
     ("MaterialTextureSlot", "map_alpha", "use_map_alpha"),
     ("MaterialTextureSlot", "map_ambient", "use_map_ambient"),
-    ("MaterialTextureSlot", "map_colordiff", "use_map_color_diff"),
+    ("MaterialTextureSlot", "map_colordiff", "use_map_color_diffuse"),
     ("MaterialTextureSlot", "map_coloremission", "use_map_color_emission"),
     ("MaterialTextureSlot", "map_colorreflection", "use_map_color_reflection"),
     ("MaterialTextureSlot", "map_colorspec", "use_map_color_spec"),

release/scripts/ui/properties_texture.py

@@ -331,7 +331,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
                 col = split.column()
                 col.label(text="Diffuse:")
                 factor_but(col, tex.use_map_diffuse, "use_map_diffuse", "diffuse_factor", "Intensity")
-                factor_but(col, tex.use_map_color_diff, "use_map_color_diff", "diffuse_color_factor", "Color")
+                factor_but(col, tex.use_map_color_diff, "use_map_color_diffuse", "diffuse_color_factor", "Color")
                 factor_but(col, tex.use_map_alpha, "use_map_alpha", "alpha_factor", "Alpha")
                 factor_but(col, tex.use_map_translucency, "use_map_translucency", "translucency_factor", "Translucency")
 

source/blender/makesrna/intern/rna_material.c

@@ -352,7 +352,7 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "From Original", "Dupli's derive their object coordinates from the original objects transformation");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
-	prop= RNA_def_property(srna, "use_map_color_diff", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_map_color_diffuse", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COL);
 	RNA_def_property_ui_text(prop, "Diffuse Color", "Causes the texture to affect basic color of the material");
 	RNA_def_property_update(prop, 0, "rna_Material_update");

source/blender/makesrna/intern/rna_mesh.c

@@ -1321,7 +1321,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Image", "");
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
-	prop= RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_image", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TEX);
 	RNA_def_property_ui_text(prop, "Tex", "Render face with texture");
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");