Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/Command.cpp

    r4881 r4889  
    5555#include "Grid.h"
    5656#include "HeightMap.h"
    57 #include "NvCamera.h"
    58 #include "NvZincBlendeReconstructor.h"
     57#include "Camera.h"
     58#include "ZincBlendeVolume.h"
     59#include "ZincBlendeReconstructor.h"
    5960#include "Unirect.h"
    6061#include "Volume.h"
     
    12821283    if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
    12831284        TRACE("ZincBlende Stream loading...");
    1284         volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory(buf.bytes());
     1285        volume = ZincBlendeReconstructor::getInstance()->loadFromMemory(buf.bytes());
    12851286        if (volume == NULL) {
    12861287            Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
Note: See TracChangeset for help on using the changeset viewer.