Changeset 136 for cafu/trunk/CaSHL/CaSHL.cpp

Timestamp:

08/27/10 11:30:01 (21 months ago)

Author:

Carsten

Message:

Reintegrated branches/cafu_to_wx back into trunk!

Files:

• cafu/trunk/CaSHL/CaSHL.cpp (modified) (2 diffs)

cafu/trunk/CaSHL/CaSHL.cpp

@@ -67 +67 @@
 #include "Templates/Array.hpp"
 #include "ConsoleCommands/Console.hpp"
+#include "ConsoleCommands/ConsoleInterpreter.hpp"
 #include "ConsoleCommands/ConsoleStdout.hpp"
 #include "FileSys/FileManImpl.hpp"
@@ -97 +98 @@
 static cf::ClipSys::CollModelManImplT CCM;
 cf::ClipSys::CollModelManI* cf::ClipSys::CollModelMan=&CCM;
+
+ConsoleInterpreterI* ConsoleInterpreter=NULL;
+MaterialManagerI*    MaterialManager   =NULL;