Fixed material diffuse loading cases

ousnius · Jan 3, 2016 · fa5acde · fa5acde
1 parent 02d8cfa
commit fa5acde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/OutfitProject.cpp b/OutfitProject.cpp
@@ -1024,6 +1024,8 @@ void OutfitProject::SetTexture(const string& shapeName, const string& textureFil
 					}
 				}
 			}
+			else
+				workNif.GetTextureForShape(shapeName, texFile);
 		}
 		else
 			workNif.GetTextureForShape(shapeName, texFile);
@@ -1032,11 +1034,11 @@ void OutfitProject::SetTexture(const string& shapeName, const string& textureFil
 			texFile = "noimg.dds";
 
 		string texturesDir = appConfig["GameDataPath"];
-		wxString combinedTexFile = texturesDir + texFile;
-		shapeTextures[shapeName] = combinedTexFile.ToStdString();
+		string combinedTexFile = texturesDir + texFile;
+		shapeTextures[shapeName] = combinedTexFile.c_str();
 	}
 	else
-		shapeTextures[shapeName] = textureFile;
+		shapeTextures[shapeName] = textureFile.c_str();
 }
 
 bool OutfitProject::IsValidShape(const string& shapeName) {

diff --git a/PreviewWindow.cpp b/PreviewWindow.cpp
@@ -201,11 +201,14 @@ void PreviewWindow::AddNifShapeTexture(NifFile* fromNif, const string& shapeName
 				}
 			}
 		}
+		else
+			fromNif->GetTextureForShape(shapeName, texFile);
 	}
 	else
-		fromNif->GetTextureForShape(shapeName, texFile, 0);
+		fromNif->GetTextureForShape(shapeName, texFile);
 
-	SetShapeTexture(shapeName, baseDataPath + texFile, isSkin);
+	string combinedTexFile = baseDataPath + texFile;
+	SetShapeTexture(shapeName, combinedTexFile.c_str(), isSkin);
 }
 
 void PreviewWindow::RightDrag(int dX, int dY) {