Commit aaeeeed5 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Undo last commit. It was meant to be a temporary change for the purpose... 

PROG: Undo last commit. It was meant to be a temporary change for the purpose of patching to the public release. Reverse-merging r6185 into Camera.cpp

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6189 41f8697f-d340-4b68-9986-7bafba869bb8
parent 2c3b0acd

isis/src/base/objs/Camera/Camera.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1255,8 +1255,7 @@ namespace Isis { 
    // neighbors is potentially expensive, so we will not calculate the neighbors

    // for shape models whose calculateLocalNormal() method won't use them.

    bool computed = p_pointComputed;

    if ((QString::compare(shapeModel->name(), "DemShape", Qt::CaseInsensitive) != 0) &&

        (QString::compare(shapeModel->name(), "EquatorialCylindricalShape", Qt::CaseInsensitive) != 0)) {

    if (!shapeModel->isDEM()) {

      // Non-DEM case: Ellipsoid, NAIF DSK, or Plane --

      // Pass in a vector where all of the "neighbors" are the origin (shape model center).

      // We do this so that if the implementation of the calculateLocalNormal() method in