Changeset 2501 for code/branches/presentation/src/orxonox/objects/GlobalShader.cc

Timestamp:

Dec 17, 2008, 9:11:12 AM (15 years ago)

Author:

landauf

Message:

• GlobalShader in dedicated mode works again
• Shooting as a client works
• Fixed problem with NotificationQueue

File:

• code/branches/presentation/src/orxonox/objects/GlobalShader.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/GlobalShader.cc

@@ -45 +45 @@
         if (!this->getScene())
             ThrowException(AbortLoading, "Can't create GlobalShader, no scene given.");
-        if (!this->getScene()->getSceneManager())
-            ThrowException(AbortLoading, "Can't create GlobalShader, no scene manager given.");
+//        if (!this->getScene()->getSceneManager())
+//            ThrowException(AbortLoading, "Can't create GlobalShader, no scene manager given.");
 
-        this->shader_.setSceneManager(this->getScene()->getSceneManager());
+        if (this->getScene()->getSceneManager())
+            this->shader_.setSceneManager(this->getScene()->getSceneManager());
 
         this->registerVariables();