Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp

1 files changed, 7 insertions, 0 deletions

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
index 05a6cdddf2..07947e0ee7 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
@@ -35,6 +35,9 @@ SWVideoConfig::SWVideoConfig()
     bDumpObjects = false;
     bDumpFrames = false;
 
+	bZComploc = true;
+	bZFreeze = true;
+
     bDumpTevStages = false;
 	bDumpTevTextureFetches = false;
 
@@ -52,6 +55,8 @@ void SWVideoConfig::Load(const char* ini_file)
     iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
 
 	iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false);
+	iniFile.Get("Rendering", "ZComploc", &bZComploc, true);
+	iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true);
 
 	iniFile.Get("Info", "ShowStats", &bShowStats, false);
 
@@ -74,6 +79,8 @@ void SWVideoConfig::Save(const char* ini_file)
     iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe);
 
 	iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer);
+	iniFile.Set("Rendering", "ZComploc", &bZComploc);
+	iniFile.Set("Rendering", "ZFreeze", &bZFreeze);
 
 	iniFile.Set("Info", "ShowStats", bShowStats);