Ignore:
Timestamp:
Dec 6, 2014 7:16:39 PM (9 years ago)
Author:
ldelgass
Message:

merge r4067 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • nanovis/branches/1.1

  • nanovis/branches/1.1/TransferFunction.h

    r3568 r4819  
    6262    }
    6363
    64     static void sample(float fraction, float *key, int count, vrmath::Vector3f *keyValue, vrmath::Vector3f *ret);
     64    static void sample(float fraction, float *keys, vrmath::Vector3f *keyValues, int count, vrmath::Vector3f *ret);
    6565
    66     static void sample(float fraction, float *key, int count, float *keyValue, float *ret);
     66    static void sample(float fraction, float *keys, float *keyValues, int count, float *ret);
    6767
    6868protected :
Note: See TracChangeset for help on using the changeset viewer.