Merge branch 'master' into fbx_io_export_ignore_parentsfbx_io_export_ignore_parents

Conflicts:
	io_scene_fbx/import_fbx.py

1 files changed, 18 insertions, 8 deletions

diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py
index 57f879c0..27c8003b 100644
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@ -26,7 +26,7 @@ bl_info = {
     "description": "Import-Export BVH from armature objects",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
-                "Scripts/Import-Export/MotionCapture_BVH",
+                "Scripts/Import-Export/BVH_Importer_Exporter",
     "support": 'OFFICIAL',
     "category": "Import-Export"}
 
@@ -87,9 +87,19 @@ class ImportBVH(bpy.types.Operator, ImportHelper, ImportBVHOrientationHelper):
             )
     use_fps_scale = BoolProperty(
             name="Scale FPS",
-            description=("Scale the framerate from the BVH to "
-                         "the current scenes, otherwise each "
-                         "BVH frame maps directly to a Blender frame"),
+            description=("Scale the framerate from the BVH to the current scenes, "
+                         "otherwise each BVH frame maps directly to a Blender frame"),
+            default=False,
+            )
+    update_scene_fps = BoolProperty(
+            name="Update Scene FPS",
+            description="Set the scene framerate to that of the BVH file (note that this "
+                        "nullifies the 'Scale FPS' option, as the scale will be 1:1)",
+            default=False
+            )
+    update_scene_duration = BoolProperty(
+            name="Update Scene Duration",
+            description="Extend the scene's duration to the BVH duration (never shortens the scene)",
             default=False,
             )
     use_cyclic = BoolProperty(
@@ -102,8 +112,8 @@ class ImportBVH(bpy.types.Operator, ImportHelper, ImportBVHOrientationHelper):
             description="Rotation conversion",
             items=(('QUATERNION', "Quaternion",
                     "Convert rotations to quaternions"),
-                   ('NATIVE', "Euler (Native)", ("Use the rotation order "
-                                                 "defined in the BVH file")),
+                   ('NATIVE', "Euler (Native)",
+                              "Use the rotation order defined in the BVH file"),
                    ('XYZ', "Euler (XYZ)", "Convert rotations to euler XYZ"),
                    ('XZY', "Euler (XZY)", "Convert rotations to euler XZY"),
                    ('YXZ', "Euler (YXZ)", "Convert rotations to euler YXZ"),
@@ -127,7 +137,7 @@ class ImportBVH(bpy.types.Operator, ImportHelper, ImportBVHOrientationHelper):
         keywords["global_matrix"] = global_matrix
 
         from . import import_bvh
-        return import_bvh.load(self, context, **keywords)
+        return import_bvh.load(context, report=self.report, **keywords)
 
 
 class ExportBVH(bpy.types.Operator, ExportHelper):
@@ -162,7 +172,7 @@ class ExportBVH(bpy.types.Operator, ExportHelper):
             name="Rotation",
             description="Rotation conversion",
             items=(('NATIVE', "Euler (Native)",
-                    "Use the rotation order defined in the BVH file"),
+                              "Use the rotation order defined in the BVH file"),
                    ('XYZ', "Euler (XYZ)", "Convert rotations to euler XYZ"),
                    ('XZY', "Euler (XZY)", "Convert rotations to euler XZY"),
                    ('YXZ', "Euler (YXZ)", "Convert rotations to euler YXZ"),