Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h

1 files changed, 7 insertions, 0 deletions

diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index e6dbb9c4..0fd1e076 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -55,6 +55,8 @@ int32 CWaterLevel::m_nRenderWaterLayers;
 
 RpAtomic *CWaterLevel::ms_pWavyAtomic;
 RpAtomic *CWaterLevel::ms_pMaskAtomic;
+//"Custom" Donīt Render Water Toggle
+bool gbDontRenderWater;
 
 
 RwTexture *gpWaterTex;
@@ -591,6 +593,11 @@ SectorRadius(float fSize)
 void
 CWaterLevel::RenderWater()
 {
+//"Custom" Donīt Render Water Toggle
+#ifndef MASTER
+	if (gbDontRenderWater)
+		return;
+#endif
 	bool bUseCamEndX   = false;
 	bool bUseCamStartY = false;