Merge branch 'master' of github.com:supertuxkart/stk-code

data/gui/custom_video_settings.stkgui

@@ -16,7 +16,7 @@
     <spacer height="4" width="10" />
     -->
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <checkbox id="dynamiclight"/>
         <spacer width="10" height="10"/>
         <label text="Advanced pipeline (lights, etc.)" I18N="Video settings"/>
@@ -24,7 +24,7 @@
     
     <spacer height="4" width="10" />
 
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <spacer width="70" height="10" />
         <label text="Shadows" I18N="Video settings"/>
         <spacer width="10" height="10"/>
@@ -33,7 +33,7 @@
     
     <spacer height="4" width="10" />
 
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <spacer width="70" height="10"/>
         
         <div layout="horizontal-row" proportion="1" height="fit">
@@ -53,7 +53,7 @@
     
     <spacer height="4" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <spacer width="70" height="10"/>
         <checkbox id="ssao"/>
         <spacer width="10" height="10"/>
@@ -62,7 +62,7 @@
     
     <spacer height="20" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <div layout="horizontal-row" proportion="1" height="fit">
             <checkbox id="motionblur"/>
             <spacer width="10" height="10"/>
@@ -80,7 +80,7 @@
     
     <spacer height="4" width="10" />
 
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <div layout="horizontal-row" proportion="1" height="fit">
             <checkbox id="glow"/>
             <spacer width="10" height="10"/>
@@ -98,7 +98,7 @@
     
     <spacer height="4" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <div layout="horizontal-row" proportion="1" height="fit">
             <checkbox id="weather_gfx"/>
             <spacer width="10" height="10"/>
@@ -116,7 +116,7 @@
     
     <spacer height="4" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <div layout="horizontal-row" proportion="1" height="fit">
             <checkbox id="ubo"/>
             <spacer width="10" height="10"/>
@@ -134,7 +134,7 @@
 	
     <spacer height="4" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <div layout="horizontal-row" proportion="1" height="fit">
             <checkbox id="hd-textures"/>
             <spacer width="10" height="10"/>
@@ -153,7 +153,7 @@
     
     <spacer height="20" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <label text="Animated Characters" I18N="Video settings" width="40%"/>
         <spacer width="10" height="10"/>
         <gauge id="steering_animations" min_value="0" max_value="2" width="50%" />
@@ -161,7 +161,7 @@
     
     <spacer height="4" width="10" />
     
-    <div layout="horizontal-row" width="100%" height="fit">
+    <div layout="horizontal-row" width="100%" proportion="1">
         <label text="Texture filtering" I18N="Video settings" width="40%"/>
         <spacer width="10" height="10"/>
         <gauge id="filtering" min_value="0" max_value="5" width="50%" />

src/graphics/irr_driver.cpp

@@ -112,6 +112,7 @@ IrrDriver::IrrDriver()
     m_wind                = new Wind();
     m_mipviz = m_wireframe = m_normals = m_ssaoviz = \
         m_lightviz = m_shadowviz = m_distortviz = 0;
+    SkyboxCubeMap = 0;
 }   // IrrDriver
 
 // ----------------------------------------------------------------------------

src/graphics/render.cpp

@@ -686,7 +686,7 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode)
 
     glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
     glBufferSubData(GL_UNIFORM_BUFFER, 0, 16 * 8 * sizeof(float), tmp);
-    delete tmp;
+    delete []tmp;
 }
 
 void IrrDriver::renderShadows()

src/utils/crash_reporting.cpp

@@ -20,7 +20,7 @@
 #include "log.hpp"
 #include <string.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(DEBUG)
     // --------------------- Windows version -----------------
     #include <Windows.h>
     #include <DbgHelp.h>