Changeset 5431 for nanovis


Ignore:
Timestamp:
May 6, 2015, 4:01:23 PM (4 years ago)
Author:
ldelgass
Message:

merge r5430 from trunk

Location:
nanovis/branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Unirect.cpp

    r5329 r5431  
    497497    char *p, *pend;
    498498
    499     dx = dy = dz = 0.0;                 /* Suppress compiler warning. */
     499    dx = dy = dz = 0.0;
    500500    x0 = y0 = z0 = 0.0;                 /* May not have an origin line. */
    501     nx = ny = nz = npts = 0;            /* Suppress compiler warning. */
     501    nx = ny = nz = npts = 0;
    502502    for (p = string, pend = p + length; p < pend; /*empty*/) {
    503503        char *line;
     
    525525                dx = ddx;
    526526                count++;
    527             } else if (ddy != 0.0) {
     527            }
     528            if (ddy != 0.0) {
    528529                dy = ddy;
    529530                count++;
    530             } else if (ddz != 0.0) {
     531            }
     532            if (ddz != 0.0) {
    531533                dz = ddz;
    532534                count++;
Note: See TracChangeset for help on using the changeset viewer.