[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3983] contrib/py/scripts/addons/ io_scene_ms3d: forgot to check if value is available;

Alexander Nussbaumer alpha-beta-release at gmx.net
Mon Nov 19 21:22:07 CET 2012


Revision: 3983
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3983
Author:   beta-tester
Date:     2012-11-19 20:22:03 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
forgot to check if value is available;

disabled "Metric [mm]" option by default

Modified Paths:
--------------
    contrib/py/scripts/addons/io_scene_ms3d/__init__.py
    contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
    contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py

Modified: contrib/py/scripts/addons/io_scene_ms3d/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/__init__.py	2012-11-19 19:08:26 UTC (rev 3982)
+++ contrib/py/scripts/addons/io_scene_ms3d/__init__.py	2012-11-19 20:22:03 UTC (rev 3983)
@@ -23,7 +23,7 @@
         'description': "Import / Export MilkShape3D MS3D files"\
                 " (conform with v1.8.4)",
         'author': "Alexander Nussbaumer",
-        'version': (0, 5, 0, 2),
+        'version': (0, 5, 0, 3),
         'blender': (2, 6, 3, 0),
         'location': "File > Import & File > Export",
         #'warning': "",

Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py	2012-11-19 19:08:26 UTC (rev 3982)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py	2012-11-19 20:22:03 UTC (rev 3983)
@@ -736,10 +736,10 @@
 
         ##########################
         # ms3d_joint to blender_edit_bone
-        if self.options.override_joint_size:
+        if ms3d_model.model_ex_object and not self.options.override_joint_size:
+            joint_length = ms3d_model.model_ex_object.joint_size
+        else:
             joint_length = self.options.joint_length
-        else:
-            joint_length = ms3d_model.model_ex_object.joint_size
         if joint_length < 0.01:
             joint_length = 0.01
 

Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py	2012-11-19 19:08:26 UTC (rev 3982)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py	2012-11-19 20:22:03 UTC (rev 3983)
@@ -226,7 +226,7 @@
 
 
     ###########################################################################
-    PROP_DEFAULT_UNIT_MM = True
+    PROP_DEFAULT_UNIT_MM = False
 
 
     ###########################################################################



More information about the Bf-extensions-cvs mailing list