Merge branch 'master' into another

ee9ea849 · nanahira · bfec26e4 · c2d4164e · ee9ea849
Commit ee9ea849 authored Apr 22, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gframe/game.cpp gframe/game.cpp +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -36,7 +36,7 @@ bool Game::Initialize() {
 	if(!device)
 		return false;
 	// Apply skin
-	if(gameConf.skin_index) {
+	if(gameConf.skin_index && gameConf.use_d3d) {
 		wchar_t skin_dir[16];
 		myswprintf(skin_dir, L"skin");
 		skinSystem = new CGUISkinSystem(skin_dir, device);