diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-10 22:00:44 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-10 22:00:44 +0300 |
commit | 3c5d5fb1cad25d75df3a3a032e86a58957311fd2 (patch) | |
tree | 7065899ee9e1a75d79b9558607827009874f212d /io_scene_x3d/__init__.py | |
parent | 039f3646b5a2a3a76fd43df1a2cf68bc0242f1c7 (diff) | |
parent | 6266b4139503bb614576f15ea4e90870ac5e597d (diff) |
Merge branch 'master' into fbx_io_export_ignore_parentsfbx_io_export_ignore_parents
Conflicts:
io_scene_fbx/import_fbx.py
Diffstat (limited to 'io_scene_x3d/__init__.py')
-rw-r--r-- | io_scene_x3d/__init__.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py index 78851a62..d5c555a1 100644 --- a/io_scene_x3d/__init__.py +++ b/io_scene_x3d/__init__.py @@ -20,16 +20,16 @@ bl_info = { "name": "Web3D X3D/VRML2 format", - "author": "Campbell Barton, Bart, Bastien Montagne", - "version": (1, 1, 0), - "blender": (2, 74, 0), + "author": "Campbell Barton, Bart, Bastien Montagne, Seva Alekseyev", + "version": (1, 2, 0), + "blender": (2, 76, 0), "location": "File > Import-Export", "description": "Import-Export X3D, Import VRML2", "warning": "", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/" - "Scripts/Import-Export/Web3D", + "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Import-Export/Web3D", "support": 'OFFICIAL', - "category": "Import-Export"} + "category": "Import-Export", +} if "bpy" in locals(): import importlib @@ -78,7 +78,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper, IOX3DOrientationHelper): ).to_4x4() keywords["global_matrix"] = global_matrix - return import_x3d.load(self, context, **keywords) + return import_x3d.load(context, **keywords) class ExportX3D(bpy.types.Operator, ExportHelper, IOX3DOrientationHelper): @@ -156,7 +156,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper, IOX3DOrientationHelper): ).to_4x4() * Matrix.Scale(self.global_scale, 4) keywords["global_matrix"] = global_matrix - return export_x3d.save(self, context, **keywords) + return export_x3d.save(context, **keywords) def menu_func_import(self, context): |