Show
Ignore:
Timestamp:
08/27/10 11:30:01 (21 months ago)
Author:
Carsten
Message:

Reintegrated branches/cafu_to_wx back into trunk!

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cafu/trunk/CaWE/AppCaWE.cpp

    r109 r136  
    7272cf::ClipSys::CollModelManI* cf::ClipSys::CollModelMan=&CCM; 
    7373 
     74ConsoleInterpreterI* ConsoleInterpreter=NULL; 
     75MaterialManagerI*    MaterialManager   =NULL; 
    7476cf::GuiSys::GuiManI* cf::GuiSys::GuiMan=NULL; 
    7577 
    … …  
    220222    m_FileConfig=NULL; 
    221223 
    222     // TODO: delete cf::FileSys::FileMan;   // Shoud have   cf::FileSys::FileMan=new cf::FileSys::FileManImplT;   in OnInit(). 
    223     cf::FileSys::FileMan=NULL; 
    224  
    225224    ConsoleInterpreter=NULL;     // This is very important, to make sure that no ConFuncT or ConVarT dtor accesses the ConsoleInterpreter that might already have been destroyed then. 
    226225