[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4630] tags/2_68_release/py/scripts/ addons: Merging r4627 through r4629 from trunk into 2_68_release
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jul 18 12:23:41 CEST 2013
Revision: 4630
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4630
Author: nazgul
Date: 2013-07-18 10:23:41 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
Merging r4627 through r4629 from trunk into 2_68_release
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4627
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4629
Modified Paths:
--------------
tags/2_68_release/py/scripts/addons/io_scene_ms3d/__init__.py
tags/2_68_release/py/scripts/addons/io_scene_ms3d/ms3d_ui.py
Property Changed:
----------------
tags/2_68_release/py/scripts/addons/
Property changes on: tags/2_68_release/py/scripts/addons
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/py/scripts/addons:4627-4629
Modified: tags/2_68_release/py/scripts/addons/io_scene_ms3d/__init__.py
===================================================================
--- tags/2_68_release/py/scripts/addons/io_scene_ms3d/__init__.py 2013-07-18 07:40:14 UTC (rev 4629)
+++ tags/2_68_release/py/scripts/addons/io_scene_ms3d/__init__.py 2013-07-18 10:23:41 UTC (rev 4630)
@@ -23,7 +23,7 @@
'description': "Import / Export MilkShape3D MS3D files"\
" (conform with MilkShape3D v1.8.4)",
'author': "Alexander Nussbaumer",
- 'version': (0, 99, 0),
+ 'version': (0, 99, 1),
'blender': (2, 66, 0),
'location': "File > Import & File > Export",
'warning': "",
Modified: tags/2_68_release/py/scripts/addons/io_scene_ms3d/ms3d_ui.py
===================================================================
--- tags/2_68_release/py/scripts/addons/io_scene_ms3d/ms3d_ui.py 2013-07-18 07:40:14 UTC (rev 4629)
+++ tags/2_68_release/py/scripts/addons/io_scene_ms3d/ms3d_ui.py 2013-07-18 10:23:41 UTC (rev 4630)
@@ -147,8 +147,9 @@
return Ms3dUi.MODE_TRANSPARENCY_DEPTH_BUFFERED_WITH_ALPHA_REF
elif(ms3d_value == Ms3dSpec.MODE_TRANSPARENCY_DEPTH_SORTED_TRIANGLES):
return Ms3dUi.MODE_TRANSPARENCY_DEPTH_SORTED_TRIANGLES
- return None
+ return Ms3dUi.MODE_TRANSPARENCY_SIMPLE
+
@staticmethod
def transparency_mode_to_ms3d(ui_value):
if(ui_value == Ms3dUi.MODE_TRANSPARENCY_SIMPLE):
@@ -157,9 +158,10 @@
return Ms3dSpec.MODE_TRANSPARENCY_DEPTH_BUFFERED_WITH_ALPHA_REF
elif(ui_value == Ms3dUi.MODE_TRANSPARENCY_DEPTH_SORTED_TRIANGLES):
return Ms3dSpec.MODE_TRANSPARENCY_DEPTH_SORTED_TRIANGLES
- return None
+ return Ms3dSpec.MODE_TRANSPARENCY_SIMPLE
+
FLAG_NONE = 'NONE'
FLAG_SELECTED = 'SELECTED'
FLAG_HIDDEN = 'HIDDEN'
More information about the Bf-extensions-cvs
mailing list