diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-04-15 09:01:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-15 09:01:34 +0400 |
commit | a6113b005908778bebfead6356061b0df13a5ce4 (patch) | |
tree | 77b8b4764f63f2817ffafd2265e60144cb693da6 /release/scripts/import_obj.py | |
parent | c9a54805a571411f26ab83df838206c237a6c025 (diff) |
Made X11 use _NET_WM_STATE_MAXIMIZED_HORZ and _NET_WM_STATE_MAXIMIZED_VERT when opening (if -p isnt given as an arg)
gsr and myself both wrote a patch for this, using gsr's.
import_obj - another error in splitting fixed.
Diffstat (limited to 'release/scripts/import_obj.py')
-rw-r--r-- | release/scripts/import_obj.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/import_obj.py b/release/scripts/import_obj.py index 92c795235d1..04b8bd42592 100644 --- a/release/scripts/import_obj.py +++ b/release/scripts/import_obj.py @@ -265,7 +265,7 @@ def split_mesh(verts_loc, faces, unique_materials, filepath, SPLIT_OB_OR_GROUP, def face_key(face): return face[4] # object - if not SPLIT_OB_OR_GROUP and SPLIT_MATERIALS: + elif not SPLIT_OB_OR_GROUP and SPLIT_MATERIALS: def face_key(face): return face[2] # material @@ -293,7 +293,7 @@ def split_mesh(verts_loc, faces, unique_materials, filepath, SPLIT_OB_OR_GROUP, vert_remap= [-1]*len(verts_loc) face_split_dict[key]= (verts_split, faces_split, unique_materials_split, vert_remap) - print key + oldkey= key face_vert_loc_indicies= face[0] |