From 491f9b7cbbba271d8b18cb41e00d5286aa96e5a6 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 10 Feb 2010 01:55:45 +0000 Subject: [PATCH] Bugfix: 3DS Importer not settings UV's correctly Thanks to example .3ds file and bug report from stridernzl. 1) The API function for adding textures to meshes was not working correctly, resulting in a Null texture slot being created (i.e. a texture slot was created, but the given texture could never be assigned to this). Fixed by making the function always require a texture as input (as with other places that use pointers as arguments). 2) In "Textured" draw mode, the imported meshes were shown white (i.e. without any textures). It appears that that the old old setting (mesh.faceUV) is no longer valid/wrapped in RNA, so worked around this by setting the 'tex' setting for UV-faces on. From the UI, this seems to do the same thing as entering editmode and assigning an image to the faces from the image editor. --- I've also removed a few lines of commented 2.4x code that is no longer valid. Hopefully there wasn't anything too valuable that I accidentally removed in this process ;) --- release/scripts/io/import_scene_3ds.py | 152 +----------------- .../makesrna/intern/rna_material_api.c | 12 +- 2 files changed, 15 insertions(+), 149 deletions(-) diff --git a/release/scripts/io/import_scene_3ds.py b/release/scripts/io/import_scene_3ds.py index 971d62d8e15..7ba5010e1c8 100644 --- a/release/scripts/io/import_scene_3ds.py +++ b/release/scripts/io/import_scene_3ds.py @@ -146,41 +146,9 @@ from import_scene_obj import unpack_face_list, load_image import bpy import Mathutils -# import Blender -# from Blender import Mesh, Object, Material, Image, Texture, Lamp, Mathutils -# from Blender.Mathutils import Vector -# import BPyImage - -# import BPyMessages - -# try: -# from struct import calcsize, unpack -# except: -# calcsize= unpack= None - - - -# # If python version is less than 2.4, try to get set stuff from module -# try: -# set -# except: -# from sets import Set as set - BOUNDS_3DS = [] -#this script imports uvcoords as sticky vertex coords -#this parameter enables copying these to face uv coords -#which shold be more useful. - -def createBlenderTexture(material, name, image): - texture = bpy.data.textures.new(name) - texture.setType('Image') - texture.image = image - material.setTexture(0, texture, Texture.TexCo.UV, Texture.MapTo.COL) - - - ###################################################### # Data Structures ###################################################### @@ -294,11 +262,8 @@ def read_chunk(file, chunk): def read_string(file): #read in the characters till we get a null character s = b'' -# s = '' while not s.endswith(b'\x00'): -# while not s.endswith('\x00'): s += struct.unpack('mtex[slot]) { ma->mtex[slot]->tex->id.us--; } @@ -69,8 +69,9 @@ static void rna_Material_add_texture(Material *ma, Tex *tex, int mapto, int texc mtex= ma->mtex[slot]; mtex->tex= tex; - id_us_plus(&tex->id); - + if (tex) + id_us_plus(&tex->id); + mtex->texco= mapto; mtex->mapto= texco; } @@ -117,7 +118,8 @@ void RNA_api_material(StructRNA *srna) func= RNA_def_function(srna, "add_texture", "rna_Material_add_texture"); RNA_def_function_ui_description(func, "Add a texture to material's free texture slot."); - parm= RNA_def_pointer(func, "texture", "Texture", "", "Texture to add."); + parm= RNA_def_pointer(func, "texture", "Texture", "Texture", "Texture to add."); + RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_enum(func, "texture_coordinates", prop_texture_coordinates_items, TEXCO_UV, "", "Source of texture coordinate information."); /* optional */ parm= RNA_def_enum(func, "map_to", prop_texture_mapto_items, MAP_COL, "", "Controls which material property the texture affects."); /* optional */ }