Ignore:
Timestamp:
May 11, 2015, 5:46:22 PM (4 years ago)
Author:
ldelgass
Message:

fix merge problem from r5489

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2/nanovis.cpp

    r5498 r5500  
    10041004            Flow::magMin = range[0];
    10051005        }
    1006         if (range[1] > magMax) {
    1007             magMax = range[1];
     1006        if (range[1] > Flow::magMax) {
     1007            Flow::magMax = range[1];
    10081008        }
    10091009        if (data->xMin() < xMin) {
Note: See TracChangeset for help on using the changeset viewer.