* Some tweaks to the OBJ importer/exporter after chatting with Campbell
authorMatt Ebb <matt@mke3.net>
Wed, 17 Sep 2008 04:07:58 +0000 (04:07 +0000)
committerMatt Ebb <matt@mke3.net>
Wed, 17 Sep 2008 04:07:58 +0000 (04:07 +0000)
- renamed the 'morph target' option to 'keep vertex order'
- enabled 'keep vertex order' by default

This should improve usability for importing and exporting shape keys, point caches, mdds ,etc.

release/scripts/export_obj.py
release/scripts/import_obj.py

index 8e7374f02b5462a416e98209c0f0ab40cded4a89..6ea890879ddb8bda9ab756157378b7a4b8e0b3ba 100644 (file)
@@ -185,7 +185,7 @@ def write(filename, objects,\
 EXPORT_TRI=False,  EXPORT_EDGES=False,  EXPORT_NORMALS=False,  EXPORT_NORMALS_HQ=False,\
 EXPORT_UV=True,  EXPORT_MTL=True,  EXPORT_COPY_IMAGES=False,\
 EXPORT_APPLY_MODIFIERS=True, EXPORT_ROTX90=True, EXPORT_BLEN_OBS=True,\
-EXPORT_GROUP_BY_OB=False,  EXPORT_GROUP_BY_MAT=False, EXPORT_MORPH_TARGET=False):
+EXPORT_GROUP_BY_OB=False,  EXPORT_GROUP_BY_MAT=False, EXPORT_KEEP_VERT_ORDER=False):
        '''
        Basic write function. The context and options must be alredy set
        This can be accessed externaly
@@ -322,7 +322,7 @@ EXPORT_GROUP_BY_OB=False,  EXPORT_GROUP_BY_MAT=False, EXPORT_MORPH_TARGET=False)
                        
                        # Sort by Material, then images
                        # so we dont over context switch in the obj file.
-                       if EXPORT_MORPH_TARGET:
+                       if EXPORT_KEEP_VERT_ORDER:
                                pass
                        elif faceuv:
                                try:    faces.sort(key = lambda a: (a.mat, a.image, a.smooth))
@@ -550,7 +550,7 @@ def write_ui(filename):
        EXPORT_BLEN_OBS = Draw.Create(1)
        EXPORT_GROUP_BY_OB = Draw.Create(0)
        EXPORT_GROUP_BY_MAT = Draw.Create(0)
-       EXPORT_MORPH_TARGET = Draw.Create(0)
+       EXPORT_KEEP_VERT_ORDER = Draw.Create(1)
        
        # removed too many options are bad!
        
@@ -563,7 +563,7 @@ def write_ui(filename):
        ('Object Prefs...'),\
        ('Apply Modifiers', EXPORT_APPLY_MODIFIERS, 'Use transformed mesh data from each object. May break vert order for morph targets.'),\
        ('Rotate X90', EXPORT_ROTX90 , 'Rotate on export so Blenders UP is translated into OBJs UP'),\
-       ('Morph Target', EXPORT_MORPH_TARGET, 'Keep vert and face order, disables some other options.'),\
+       ('Keep Vert Order', EXPORT_KEEP_VERT_ORDER, 'Keep vert and face order, disables some other options.'),\
        ('Extra Data...'),\
        ('Edges', EXPORT_EDGES, 'Edges not connected to faces.'),\
        ('Normals', EXPORT_NORMALS, 'Export vertex normal data (Ignored on import).'),\
@@ -581,7 +581,7 @@ def write_ui(filename):
        if not Draw.PupBlock('Export...', pup_block):
                return
        
-       if EXPORT_MORPH_TARGET.val:
+       if EXPORT_KEEP_VERT_ORDER.val:
                EXPORT_BLEN_OBS.val = False
                EXPORT_GROUP_BY_OB.val = False
                EXPORT_GROUP_BY_MAT.val = False
@@ -606,7 +606,7 @@ def write_ui(filename):
        EXPORT_BLEN_OBS = EXPORT_BLEN_OBS.val
        EXPORT_GROUP_BY_OB = EXPORT_GROUP_BY_OB.val
        EXPORT_GROUP_BY_MAT = EXPORT_GROUP_BY_MAT.val
-       EXPORT_MORPH_TARGET = EXPORT_MORPH_TARGET.val
+       EXPORT_KEEP_VERT_ORDER = EXPORT_KEEP_VERT_ORDER.val
        
        
        
@@ -656,7 +656,7 @@ def write_ui(filename):
                        EXPORT_NORMALS_HQ, EXPORT_UV, EXPORT_MTL,\
                        EXPORT_COPY_IMAGES, EXPORT_APPLY_MODIFIERS,\
                        EXPORT_ROTX90, EXPORT_BLEN_OBS,\
-                       EXPORT_GROUP_BY_OB, EXPORT_GROUP_BY_MAT, EXPORT_MORPH_TARGET)
+                       EXPORT_GROUP_BY_OB, EXPORT_GROUP_BY_MAT, EXPORT_KEEP_VERT_ORDER)
                
                Blender.Set('curframe', orig_frame)
        
index e5bdc796e16b6efb7654c6d949e27cbcd1995e0c..b467cca112f458b15e157bb0ef7f02a6897a43cb 100644 (file)
@@ -763,7 +763,7 @@ def load_obj_ui(filepath, BATCH_LOAD= False):
        SPLIT_OBJECTS= Draw.Create(1)
        SPLIT_GROUPS= Draw.Create(1)
        SPLIT_MATERIALS= Draw.Create(1)
-       MORPH_TARGET= Draw.Create(0)
+       KEEP_VERT_ORDER= Draw.Create(1)
        CLAMP_SIZE= Draw.Create(10.0)
        IMAGE_SEARCH= Draw.Create(1)
        
@@ -779,7 +779,7 @@ def load_obj_ui(filepath, BATCH_LOAD= False):
        ('Group', SPLIT_GROUPS, 'Import OBJ Groups into Blender Objects'),\
        ('Material', SPLIT_MATERIALS, 'Import each material into a seperate mesh (Avoids > 16 per mesh error)'),\
        'Options...',\
-       ('Morph Target', MORPH_TARGET, 'Keep vert and face order, disables some other options.'),\
+       ('Keep Vert Order', KEEP_VERT_ORDER, 'Keep vert and face order, disables some other options.'),\
        ('Clamp Scale:', CLAMP_SIZE, 0.0, 1000.0, 'Clamp the size to this maximum (Zero to Disable)'),\
        ('Image Search', IMAGE_SEARCH, 'Search subdirs for any assosiated images (Warning, may be slow)'),\
        ]
@@ -787,7 +787,7 @@ def load_obj_ui(filepath, BATCH_LOAD= False):
        if not Draw.PupBlock('Import OBJ...', pup_block):
                return
        
-       if MORPH_TARGET.val:
+       if KEEP_VERT_ORDER.val:
                SPLIT_OBJECTS.val = False
                SPLIT_GROUPS.val = False
                SPLIT_MATERIALS.val = False