Ignore:
Timestamp:
Aug 2, 2014 1:45:12 AM (6 years ago)
Author:
ldelgass
Message:

merge r3596 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/nanovis.cpp

    r3568 r4611  
    6464#include "NvCamera.h"
    6565#include "NvShader.h"
    66 #include "NvColorTableRenderer.h"
    6766#include "NvFlowVisRenderer.h"
    6867#include "NvLIC.h"
     
    144143vrmath::Vector3f NanoVis::sceneMin, NanoVis::sceneMax;
    145144
    146 NvColorTableRenderer *NanoVis::colorTableRenderer = NULL;
    147145VolumeRenderer *NanoVis::volRenderer = NULL;
    148146#ifdef notdef
     
    196194        TRACE("Deleting planeRenderer");
    197195        delete planeRenderer;
    198     }
    199     if (colorTableRenderer != NULL) {
    200         TRACE("Deleting colorTableRenderer");
    201         delete colorTableRenderer;
    202196    }
    203197    if (legendTexture != NULL) {
     
    890884    fonts->setFont("verdana");
    891885
    892     colorTableRenderer = new NvColorTableRenderer();
    893     colorTableRenderer->setFonts(fonts);
    894886#ifdef notdef
    895887    flowVisRenderer = new NvFlowVisRenderer(NMESH, NMESH);
Note: See TracChangeset for help on using the changeset viewer.