diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 18:09:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 18:09:18 +0300 |
commit | 9cb71d1159a1cd8aa110e195d42828f863cdd02a (patch) | |
tree | 2a9fa2cd0a366e9ba6cceb49ba1a107c3003e3ae /release | |
parent | c9f353956c19abf184496978927c4af5209ec97f (diff) |
update for change to Matrix class.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/op/io_scene_3ds/import_3ds.py | 10 | ||||
-rw-r--r-- | release/scripts/op/io_shape_mdd/export_mdd.py | 11 | ||||
-rw-r--r-- | release/scripts/op/uvcalc_smart_project.py | 6 |
3 files changed, 11 insertions, 16 deletions
diff --git a/release/scripts/op/io_scene_3ds/import_3ds.py b/release/scripts/op/io_scene_3ds/import_3ds.py index d3f5a5d3b2f..7ffdcd3c853 100644 --- a/release/scripts/op/io_scene_3ds/import_3ds.py +++ b/release/scripts/op/io_scene_3ds/import_3ds.py @@ -612,11 +612,11 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): data = list( struct.unpack('<ffffffffffff', temp_data) ) new_chunk.bytes_read += STRUCT_SIZE_4x3MAT - contextMatrix_rot = mathutils.Matrix(\ - data[:3] + [0],\ - data[3:6] + [0],\ - data[6:9] + [0],\ - data[9:] + [1]) + contextMatrix_rot = mathutils.Matrix((data[:3] + [0], \ + data[3:6] + [0], \ + data[6:9] + [0], \ + data[9:] + [1], \ + )) elif (new_chunk.ID == MAT_MAP_FILEPATH): texture_name, read_str_len = read_string(file) diff --git a/release/scripts/op/io_shape_mdd/export_mdd.py b/release/scripts/op/io_shape_mdd/export_mdd.py index 7fb11facf58..42795d450ab 100644 --- a/release/scripts/op/io_shape_mdd/export_mdd.py +++ b/release/scripts/op/io_shape_mdd/export_mdd.py @@ -73,12 +73,11 @@ def save(operator, context, filepath="", frame_start=1, frame_end=300, fps=25): me = obj.create_mesh(scene, True, 'PREVIEW') #Flip y and z - mat_flip = mathutils.Matrix(\ - [1.0, 0.0, 0.0, 0.0],\ - [0.0, 0.0, 1.0, 0.0],\ - [0.0, 1.0, 0.0, 0.0],\ - [0.0, 0.0, 0.0, 1.0],\ - ) + mat_flip = mathutils.Matrix(((1.0, 0.0, 0.0, 0.0), \ + (0.0, 0.0, 1.0, 0.0), \ + (0.0, 1.0, 0.0, 0.0), \ + (0.0, 0.0, 0.0, 1.0), \ + )) numverts = len(me.vertices) diff --git a/release/scripts/op/uvcalc_smart_project.py b/release/scripts/op/uvcalc_smart_project.py index d4b5a38e11d..3a835ae671e 100644 --- a/release/scripts/op/uvcalc_smart_project.py +++ b/release/scripts/op/uvcalc_smart_project.py @@ -78,11 +78,7 @@ def pointInTri2D(v, v1, v2, v3): nor = side1.cross(side2) - l1 = [side1[0], side1[1], side1[2]] - l2 = [side2[0], side2[1], side2[2]] - l3 = [nor[0], nor[1], nor[2]] - - mtx = Matrix(l1, l2, l3) + mtx = Matrix((side1, side2, nor)) # Zero area 2d tri, even tho we throw away zerop area faces # the projection UV can result in a zero area UV. |