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/FlowBox.cpp

    r4893 r4904  
    5252    bboxMax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
    5353
    54     Vector3f origin = vol->location();
     54    Vector3f origin = vol->getPosition();
    5555    Vector3f scale = vol->getPhysicalScaling();
    5656
     
    131131    glPushMatrix();
    132132
    133     Vector3f origin = vol->location();
     133    Vector3f origin = vol->getPosition();
    134134    glTranslatef(origin.x, origin.y, origin.z);
    135135
Note: See TracChangeset for help on using the changeset viewer.