Merge branch 'master' into server

3f787954 · nanahira · 4a42ccf1 · c2d4164e · 3f787954 · 803af5d6
Commit 3f787954 authored Apr 22, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -98,7 +98,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);

--- a/script @ 803af5d6
+++ b/script @ 803af5d6
-Subproject commit 45fa3f0610504b48bcf1cd299ecd88d7d2393d9b
+Subproject commit 803af5d691b39a4a36661150dc4f957ba8f20187