diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 19:36:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 19:36:10 +0400 |
commit | 663ed695afc1fa68f1dece7cda1d6edf76c4e91a (patch) | |
tree | d0b5e64c5a632c91bb93f2321ac0262273ced28e | |
parent | 4c84416a22f8cf52782cf6d608098e042bf1f95a (diff) |
-rw-r--r-- | io_scene_map/export_map.py | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/io_scene_map/export_map.py b/io_scene_map/export_map.py index c13efaf3..5373d21f 100644 --- a/io_scene_map/export_map.py +++ b/io_scene_map/export_map.py @@ -16,7 +16,7 @@ # # ##### END GPL LICENSE BLOCK ##### -# <pep8-80 compliant> +# <pep8 compliant> import bpy import os @@ -44,14 +44,6 @@ def face_uv_get(face): return None -def face_material_get(face): - me = face.id_data - try: - return me.materials[f.material_index] - except: - return None - - def write_cube2brush(file, faces): ''' Takes 6 faces and writes a brush, @@ -74,18 +66,15 @@ def write_cube2brush(file, faces): for v in f.vertices[:][2::-1]: file.write(format_vec % me.vertices[v].co[:]) - material = face_material_get(f) + uf = face_uv_get(f) - if material and material.game_settings.invisible: + if uf and uf.hide: file.write(PREF_INVIS_TEX) else: - uf = face_uv_get(f) - image = uf.image if uf else None if image: - file.write(os.path.splitext( - bpy.path.basename(image.filepath))[0]) + file.write(os.path.splitext(bpy.path.basename(image.filepath))[0]) else: file.write(PREF_NULL_TEX) @@ -114,13 +103,11 @@ def write_face2brush(file, face): image_text = PREF_NULL_TEX - material = face_material_get(f) + uf = face_uv_get(face) - if material and material.game_settings.invisible: + if uf and uf.hide: image_text = PREF_INVIS_TEX else: - uf = face_uv_get(face) - image = uf.image if uf else None if image: @@ -282,18 +269,13 @@ def write_node_map(file, ob): def export_map(context, filepath): """ pup_block = [\ - ('Scale:', PREF_SCALE, 1, 1000, - 'Scale the blender scene by this value.'),\ - ('Face Width:', PREF_FACE_THICK, 0.01, 10, - 'Thickness of faces exported as brushes.'),\ - ('Grid Snap', PREF_GRID_SNAP, - 'snaps floating point values to whole numbers.'),\ + ('Scale:', PREF_SCALE, 1, 1000, 'Scale the blender scene by this value.'),\ + ('Face Width:', PREF_FACE_THICK, 0.01, 10, 'Thickness of faces exported as brushes.'),\ + ('Grid Snap', PREF_GRID_SNAP, 'snaps floating point values to whole numbers.'),\ 'Null Texture',\ - ('', PREF_NULL_TEX, 1, 128, - 'Export textureless faces with this texture'),\ + ('', PREF_NULL_TEX, 1, 128, 'Export textureless faces with this texture'),\ 'Unseen Texture',\ - ('', PREF_INVIS_TEX, 1, 128, - 'Export invisible faces with this texture'),\ + ('', PREF_INVIS_TEX, 1, 128, 'Export invisible faces with this texture'),\ ] if not Draw.PupBlock('map export', pup_block): |