diff --git a/utils/Modeller/uv_export_svg.py b/utils/Modeller/uv_export_svg.py index 51a96519e..14d87cc9f 100644 --- a/utils/Modeller/uv_export_svg.py +++ b/utils/Modeller/uv_export_svg.py @@ -71,7 +71,7 @@ class UVFaceGroups: found = [] for face in faces.itervalues(): for c in face.uv: - if (tuple(c)) in uvcoords: + if tuple(c) in uvcoords: for c in face.uv: uvcoords[tuple(c)] = True found.append(face) @@ -83,9 +83,9 @@ class UVFaceGroups: del faces[face.index] -def hashcolor(name): - random.seed(hash(name)) - c = [random.randint(220, 255), random.randint(120, 220), random.randint(120, 220)] +def stringcolor(string): + random.seed(hash(string)) + c = [random.randint(220, 255), random.randint(120, 240), random.randint(120, 240)] random.shuffle(c) return "#%02x%02x%02x" % tuple(c) @@ -117,7 +117,7 @@ def write_svg(path): for meshname, v in objects.iteritems(): objname, mesh = v - color = FILL_COLOR or hashcolor(meshname) + color = FILL_COLOR or stringcolor(meshname) svg.write('\t\n' % (color, objname, objname)) diff --git a/utils/Modeller/uv_import_svg.py b/utils/Modeller/uv_import_svg.py index 25fe8c2fa..97b3d57cb 100755 --- a/utils/Modeller/uv_import_svg.py +++ b/utils/Modeller/uv_import_svg.py @@ -153,7 +153,7 @@ def parse_transform(s): elif cmd == "matrix": if num == 6: - matrix.multiply(Matrix(arg[0], arg[1], arg[2], arg[3], arg[4], arg[5])) + matrix.multiply(Matrix(*arg)) continue else: