Merge branch 'next' of https://github.com/sgrenier/GamePlay into next

Conflicts:
	gameplay/src/Button.cpp
	gameplay/src/Button.h
	gameplay/src/CheckBox.cpp
	gameplay/src/CheckBox.h
	gameplay/src/Container.cpp
	gameplay/src/Container.h
	gameplay/src/ControlFactory.h
	gameplay/src/ImageControl.cpp
	gameplay/src/ImageControl.h
	gameplay/src/Joystick.cpp
	gameplay/src/Joystick.h
	gameplay/src/Label.cpp
	gameplay/src/Label.h
	gameplay/src/RadioButton.cpp
	gameplay/src/RadioButton.h
	gameplay/src/Slider.cpp
	gameplay/src/Slider.h
	gameplay/src/TextBox.cpp
	gameplay/src/TextBox.h

gameplay/src/ControlFactory.cpp

@@ -28,6 +28,11 @@ ControlFactory::~ControlFactory()
 {
 }
 
+void ControlFactory::finalize()
+{
+    SAFE_DELETE(__controlFactory);
+}
+
 ControlFactory* ControlFactory::getInstance() 
 {
 	if (__controlFactory == NULL)

gameplay/src/Game.cpp

@@ -5,6 +5,7 @@
 #include "FileSystem.h"
 #include "FrameBuffer.h"
 #include "SceneLoader.h"
+#include "ControlFactory.h"
 
 /** @script{ignore} */
 GLenum __gl_error_code = GL_NO_ERROR;
@@ -200,6 +201,8 @@ void Game::shutdown()
         _socialController->finalize();
         SAFE_DELETE(_socialController);
 
+        ControlFactory::finalize();
+
         // Note: we do not clean up the script controller here
         // because users can call Game::exit() from a script.
 

gameplay/src/TerrainPatch.cpp

@@ -475,7 +475,7 @@ bool TerrainPatch::updateMaterial()
         std::ostringstream defines;
         defines << "LAYER_COUNT " << _layers.size();
         defines << ";SAMPLER_COUNT " << _samplers.size();
-        
+
         if (_terrain->isFlagSet(Terrain::DEBUG_PATCHES))
             defines << ";DEBUG_PATCHES";
         if (_terrain->_normalMap)
@@ -523,7 +523,7 @@ bool TerrainPatch::updateMaterial()
         if (_layers.size() > 0)
             material->getParameter("u_surfaceLayerMaps")->setValue((const Texture::Sampler**)&_samplers[0], (unsigned int)_samplers.size());
 
-        if (_terrain->isFlagSet(Terrain::DEBUG_PATCHES) && !_levels[i]->model->getMaterial())
+        if (_terrain->isFlagSet(Terrain::DEBUG_PATCHES))
         {
             material->getParameter("u_row")->setValue((float)_row);
             material->getParameter("u_column")->setValue((float)_column);