[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2388] trunk/py/scripts/addons: fix for various errors in scripts

[Campbell Barton]

Revision: 2388
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2388
Author:   campbellbarton
Date:     2011-10-04 08:56:57 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
fix for various errors in scripts

Modified Paths:
--------------
    trunk/py/scripts/addons/io_anim_bvh/import_bvh.py
    trunk/py/scripts/addons/io_scene_3ds/export_3ds.py
    trunk/py/scripts/addons/io_scene_obj/__init__.py
    trunk/py/scripts/addons/io_scene_obj/export_obj.py
    trunk/py/scripts/addons/io_scene_x3d/export_x3d.py

Modified: trunk/py/scripts/addons/io_anim_bvh/import_bvh.py
===================================================================
--- trunk/py/scripts/addons/io_anim_bvh/import_bvh.py	2011-10-03 18:10:39 UTC (rev 2387)
+++ trunk/py/scripts/addons/io_anim_bvh/import_bvh.py	2011-10-04 08:56:57 UTC (rev 2388)
@@ -387,7 +387,7 @@
         bone.head = bvh_node.rest_head_world
         bone.tail = bvh_node.rest_tail_world
 
-        # ZERO AREA BONES.
+        # Zero Length Bones! (an exceptional case)
         if (bone.head - bone.tail).length < 0.001:
             print("\tzero length bone found:", bone.name)
             if bvh_node.parent:

Modified: trunk/py/scripts/addons/io_scene_3ds/export_3ds.py
===================================================================
--- trunk/py/scripts/addons/io_scene_3ds/export_3ds.py	2011-10-03 18:10:39 UTC (rev 2387)
+++ trunk/py/scripts/addons/io_scene_3ds/export_3ds.py	2011-10-04 08:56:57 UTC (rev 2388)
@@ -488,7 +488,7 @@
     if not material:
         material_chunk.add_subchunk(make_material_subchunk(MATAMBIENT, (0.0, 0.0, 0.0)))
         material_chunk.add_subchunk(make_material_subchunk(MATDIFFUSE, (0.8, 0.8, 0.8)))
-        material_chunk.add_subchunk(make_material_subchunk(MATSPECULAR, (1.0, 1.0, 1.0))
+        material_chunk.add_subchunk(make_material_subchunk(MATSPECULAR, (1.0, 1.0, 1.0)))
 
     else:
         material_chunk.add_subchunk(make_material_subchunk(MATAMBIENT, (material.ambient * material.diffuse_color)[:]))

Modified: trunk/py/scripts/addons/io_scene_obj/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/__init__.py	2011-10-03 18:10:39 UTC (rev 2387)
+++ trunk/py/scripts/addons/io_scene_obj/__init__.py	2011-10-04 08:56:57 UTC (rev 2388)
@@ -254,17 +254,17 @@
             description="Convert all faces to triangles",
             default=False,
             )
+    use_nurbs = BoolProperty(
+            name="Write Nurbs",
+            description="Write nurbs curves as OBJ nurbs rather then "
+                        "converting to geometry",
+            default=False,
+            )
     use_vertex_groups = BoolProperty(
             name="Polygroups",
             description="",
             default=False,
             )
-    use_nurbs = BoolProperty(
-            name="Nurbs",
-            description="Write nurbs curves as OBJ nurbs rather then "
-                        "converting to geometry",
-            default=False,
-            )
 
     # grouping group
     use_blen_objects = BoolProperty(

Modified: trunk/py/scripts/addons/io_scene_obj/export_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/export_obj.py	2011-10-03 18:10:39 UTC (rev 2387)
+++ trunk/py/scripts/addons/io_scene_obj/export_obj.py	2011-10-04 08:56:57 UTC (rev 2388)
@@ -147,7 +147,7 @@
     return False
 
 
-def write_nurb(file, ob, ob_mat):
+def write_nurb(fw, ob, ob_mat):
     tot_verts = 0
     cu = ob.data
 
@@ -321,7 +321,7 @@
             # Nurbs curve support
             if EXPORT_CURVE_AS_NURBS and test_nurbs_compat(ob):
                 ob_mat = EXPORT_GLOBAL_MATRIX * ob_mat
-                totverts += write_nurb(file, ob, ob_mat)
+                totverts += write_nurb(fw, ob, ob_mat)
                 continue
             # END NURBS
 

Modified: trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/export_x3d.py	2011-10-03 18:10:39 UTC (rev 2387)
+++ trunk/py/scripts/addons/io_scene_x3d/export_x3d.py	2011-10-04 08:56:57 UTC (rev 2388)
@@ -168,16 +168,15 @@
     return par_lookup.get(None, [])
 
 
-
 # -----------------------------------------------------------------------------
 # H3D Functions
 # -----------------------------------------------------------------------------
 def h3d_shader_glsl_frag_patch(filepath, scene, global_vars, frag_uniform_var_map):
     h3d_file = open(filepath, 'r')
     lines = []
-    
+
     last_transform = None
-    
+
     for l in h3d_file:
         if l.startswith("void main(void)"):
             lines.append("\n")
@@ -194,7 +193,7 @@
         elif l.lstrip().startswith("lamp_visibility_sun_hemi("):
             w = l.split(', ')
             w[0] = w[0][len("lamp_visibility_sun_hemi(") + 1:]
-            
+
             if not h3d_is_object_view(scene, frag_uniform_var_map[w[0]]):
                 w[0] = '(mat3(normalize(view_matrix[0].xyz), normalize(view_matrix[1].xyz), normalize(view_matrix[2].xyz)) * -%s)' % w[0]
             else:
@@ -1490,6 +1489,7 @@
         bpy.ops.object.mode_set(mode='OBJECT')
 
     if use_compress:
+        import gzip
         file = gzip.open(filepath, 'w')
     else:
         file = open(filepath, 'w')