diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 12:11:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 12:11:26 +0400 |
| commit | 6da7684ca63f9f396fe90ae8927ee3bf17a8106f (patch) | |
| tree | 05ee7d5f431cb693cf741f5fbfb702b24d482367 /release | |
| parent | 4f5f868a523430aa41de8bd63f888878aaf63002 (diff) | |
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.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/io/import_scene_3ds.py | 2 | ||||
| -rw-r--r-- | release/scripts/op/animsys_update.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/io/import_scene_3ds.py b/release/scripts/io/import_scene_3ds.py index 266f7001cc2..6378d93df62 100644 --- a/release/scripts/io/import_scene_3ds.py +++ b/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 diff --git a/release/scripts/op/animsys_update.py b/release/scripts/op/animsys_update.py index 0350eeef6b8..0ea13b24776 100644 --- a/release/scripts/op/animsys_update.py +++ b/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"), diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 7996e162b8e..c6c6689a3d9 100644 --- a/release/scripts/ui/properties_texture.py +++ b/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") |