Unverified Commit 57baf6ea authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Fixes Onerror Continue for ISIS Raytracing (#5078) 

* Removes line updating onerror after a failed attempt to generate a bullet shapemodel

* Updated changelog
parent 6de691e8

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ release. 
- Fixed shadow shifting image by 2 pixels to the upper left corner. [#5035](https://github.com/USGS-Astrogeology/ISIS3/issues/5035)

- Fixed compiler warnings on ubuntu [#4911](https://github.com/USGS-Astrogeology/ISIS3/issues/4911)

- Fixes embree shape models not being from .BDS extension files [5064](https://github.com/USGS-Astrogeology/ISIS3/issues/5064)

- Fixed failing shapemodel parameters when bullet was the preferred ray tracing engine but could not be created. [#5062](https://github.com/USGS-Astrogeology/ISIS3/issues/5062)



## [7.1.0] - 2022-07-27

isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp

+8 −4
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ namespace Isis { 


            // Bullet failed to load the kernel...test failure conditions

            if ("cub" == ext) {

              onerror = "fail";   // This is fatal no matter the condition

              QString mess = "Bullet could not initialize ISIS Cube DEM";

              throw IException(IException::Unknown, mess, _FILEINFO_);

            }
@@ -189,11 +188,14 @@ namespace Isis { 


            return ( b_model );

          }

        } catch (IException &ie) {

        } 

        catch (IException &ie) {

          fileError.append(ie);

          QString mess = "Unable to create preferred BulletShapeModel";

          fileError.append(IException(IException::Unknown, mess, _FILEINFO_));

          if ("fail" == onerror) throw fileError;

          if ("fail" == onerror) {

            throw fileError;

          }

        }



        // Don't have ShapeModel yet - invoke pre-exising behavior (2017-03-23)
@@ -227,7 +229,9 @@ namespace Isis { 
          fileError.append(ie);

          QString mess = "Unable to create preferred EmbreeShapeModel";

          fileError.append(IException(IException::Unknown, mess, _FILEINFO_));

          if ("fail" == onerror) throw fileError;

          if ("fail" == onerror) {

            throw fileError;

          }

        }

      }