From 7ca4dfdfa05f1c5ad77fc2cda45ae38390e7136d Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Sat, 21 May 2011 10:36:23 +0900
Subject: [PATCH] fix bpy_extras

---
 MANIFEST.in                      | 2 +-
 README.txt                       | 4 ++++
 blender25-meshio/__init__.py     | 5 ++++-
 blender25-meshio/import_pmd.py   | 5 +++--
 blender25-meshio/pymeshio/pmd.py | 2 +-
 setup.py                         | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 334e04c..fc4bba3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include blender25-meshio/*
+include blender25-meshio/*.py
diff --git a/README.txt b/README.txt
index b399c12..48d6ad3 100644
--- a/README.txt
+++ b/README.txt
@@ -19,6 +19,10 @@ Import-Exportの中から"meshio. (.pmd)(.mqo)"を探して右のチェックボ
 更新履歴
 ========
 
+20110521 1.8.1
+--------------
+fix io_utils -> bpy_extras.io_utils
+
 20110521 1.8.0
 --------------
 RigidBodyとConstraintの読み込みを実装。
diff --git a/blender25-meshio/__init__.py b/blender25-meshio/__init__.py
index df17a8f..9f7d747 100644
--- a/blender25-meshio/__init__.py
+++ b/blender25-meshio/__init__.py
@@ -23,7 +23,10 @@ if "bpy" in locals():
 
 import bpy
 from bpy.props import StringProperty, FloatProperty, BoolProperty
-from io_utils import ImportHelper, ExportHelper
+try:
+    from io_utils import ImportHelper, ExportHelper
+except:
+    from bpy_extras.io_utils import ImportHelper, ExportHelper
 from . import bl25 as bl
 
 
diff --git a/blender25-meshio/import_pmd.py b/blender25-meshio/import_pmd.py
index 8d396f0..79be446 100644
--- a/blender25-meshio/import_pmd.py
+++ b/blender25-meshio/import_pmd.py
@@ -94,8 +94,9 @@ try:
 except ImportError:
     # full python
     from .pymeshio import englishmap
-    from .pymeshio import mmd as pmd
-    pmd.IO=pmd.PMDLoader
+    #from .pymeshio import mmd as pmd
+    #pmd.IO=pmd.PMDLoader
+    from .pymeshio import pmd
 
 # for 2.5
 import bpy
diff --git a/blender25-meshio/pymeshio/pmd.py b/blender25-meshio/pymeshio/pmd.py
index 4d3b0f7..e42365b 100644
--- a/blender25-meshio/pymeshio/pmd.py
+++ b/blender25-meshio/pymeshio/pmd.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 import os
 import struct
-from mmd import *
+from .mmd import *
 
 ###############################################################################
 # PMD
diff --git a/setup.py b/setup.py
index 26443e0..a8182ad 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
         name='pymeshio',
-        version='1.8.0',
+        version='1.8.1',
         description='pure python 3d model io library',
         keywords=[],
         author='ousttrue',
-- 
2.11.0