Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/nanovisServer.cpp

    r4889 r4904  
    1616#include <sys/time.h>
    1717#include <sys/times.h>
    18 #include <sys/types.h> // for pid_t
    1918#include <sys/uio.h> // for readv/writev
    2019#include <unistd.h>
     
    334333    NanoVis::removeAllData();
    335334
    336     Shader::exitCg();
     335    Shader::exit();
    337336
    338337    //close log file
     
    377376    int ret = 0;
    378377    int status = TCL_OK;
    379     NanoVis::flags &= ~NanoVis::REDRAW_PENDING;
    380378
    381379    Tcl_DString cmdbuffer;
     
    637635    }
    638636
     637    Shader::init();
    639638    // Override callback with one that cleans up server on exit
    640639    Shader::setErrorCallback(shaderErrorCallback);
Note: See TracChangeset for help on using the changeset viewer.