Merge branch '1.0.4'

matunnkazumi · Feb 18, 2020 · fcbe080 · fcbe080
2 parents d899e89 + 2599094
commit fcbe080
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/__init__.py b/__init__.py
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "MMD PMX Format (Extend)",
     "author": "matunnkazumi",
-    "version": (1, 0, 3),
+    "version": (1, 0, 4),
     "blender": (2, 80, 0),
     "location": "File > Import-Export",
     "description": "Import-Export PMX model data",

diff --git a/add_function.py b/add_function.py
@@ -1178,7 +1178,7 @@ def execute(self, context):
             if prefs.use_japanese_name:
                 filepath = os.path.join(os.path.dirname(__file__), "template_dict.csv")
 
-                with open(filepath) as csvfile:
+                with open(filepath, encoding="utf-8") as csvfile:
                     reader = csv.reader(csvfile)
                     toJP = {en: jp for en, jp in reader}
 

diff --git a/import_pmx.py b/import_pmx.py
@@ -627,7 +627,7 @@ def read_pmx_data(context, filepath="",
             # self.EdgeSize = 1.0
 
             # Texture
-            if mat_data.TextureIndex != -1:
+            if mat_data.TextureIndex != -1 and mat_data.TextureIndex in textures_dic:
                 temp_tex = textures_dic[mat_data.TextureIndex]
                 temp_principled.base_color_texture.image = temp_tex.image
                 temp_principled.base_color_texture.use_alpha = True