Frederic Bouvier:

This patch was inspired by Norman. Otherwise there is a segfault on Linux because the global variable tries to access OGL before a valid context is initialized.

diff --git a/simgear/scene/sky/clouds3d/SkySceneLoader.cpp b/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
index 7ab82735574a5b9ca507b7f97c1d05b02f91a8bf..d629171cdc9186fcab62d08974de2d926949a65c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
+++ b/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
@@ -49,7 +49,7 @@ Point3D origin;
 Camera *pCam = new Camera();
 // Need to add a light here until we figure out how to use the sun position and color
 SkyLight::SkyLightType eType = SkyLight::SKY_LIGHT_DIRECTIONAL;
-SkyLight *pLight = new SkyLight(eType);
+SkyLight *pLight = 0;
 
 // hack
 sgMat4 my_copy_of_ssgOpenGLAxisSwapMatrix =
@@ -105,6 +105,7 @@ SkySceneLoader::~SkySceneLoader()
 //bool SkySceneLoader::Load(std::string filepath)
 bool SkySceneLoader::Load( unsigned char *data, unsigned int size, double latitude, double longitude )
 {
+  pLight = new SkyLight(eType);
   // Need to create the managers
   cout << "GraphicsContext::Instantiate();" << endl;
   GraphicsContext::Instantiate();