Merge lp:~unity-team/nux/nux.null-pointer-exceptions into lp:nux

[Eleni Maria Stea]

It fixes two null pointer exceptions found when running nux playground examples. There might be similar problems elsewhere!

It fixes two null pointer exceptions found when running nux playground examples. There might be similar problems elsewhere!

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'NuxGraphics/IOpenGLGLSLShader.cpp'
--- NuxGraphics/IOpenGLGLSLShader.cpp	2012-09-30 16:35:58 +0000
+++ NuxGraphics/IOpenGLGLSLShader.cpp	2012-10-10 13:35:23 +0000
@@ -515,6 +515,10 @@
     ObjectPtr<IOpenGLVertexShader> vs = GetGraphicsDisplay()->GetGpuDevice()->CreateVertexShader(); //new IOpenGLVertexShader;
 
     std::string ProcessedShaderSource;
+    if(!VtxShaderPreprocessorDefines)
+    {
+      VtxShaderPreprocessorDefines = "";
+    }
     std::string Defines(VtxShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(glslshader, ProcessedShaderSource, Defines);
 
@@ -530,6 +534,10 @@
     ObjectPtr<IOpenGLPixelShader> ps = GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader(); //new IOpenGLPixelShader;
 
     std::string ProcessedShaderSource;
+    if (!FrgShaderPreprocessorDefines)
+    {
+      FrgShaderPreprocessorDefines = "";
+    }
     std::string Defines(FrgShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(glslshader, ProcessedShaderSource, Defines);