Merge branch 'master' into cameraSaveFix

Author: dcwhite

src/Interface/Modules/Render/ES/AssetBootstrap.cc

@@ -54,12 +54,10 @@ class AssetBootstrap : public spire::EmptySystem
     {
       // Load geometry and associated vertex and fragment shaders.
       geomMan->loadGeometry(core, cachedEntity, "Assets/arrow.geom");
-      geomMan->loadGeometry(core, cachedEntity, "Assets/sphere.geom");
     }
     if (std::shared_ptr<ren::ShaderMan> shaderMan = sm.lock())
     {
         // Load shader we will use with the coordinate axes.
-      shaderMan->loadVertexAndFragmentShader(core, cachedEntity, "Shaders/DirPhong");
       shaderMan->loadVertexAndFragmentShader(core, cachedEntity, "Shaders/OrientationGlyph");
     }
 

src/Interface/Modules/Render/ES/Core.cc

@@ -106,6 +106,20 @@ std::string ESCore::toString(std::string prefix) const
   return output;
 }
 
+bool ESCore::hasGeomPromise() const
+{
+  for(auto& comp : mComponents)
+  {
+    if(comp.second->getNumComponents() > 0)
+    {
+      if(mComponentIDNameMap.find(comp.first) != mComponentIDNameMap.end() &&
+         mComponentIDNameMap.at(comp.first) == "ren:GeomPromise")
+        return true;
+    }
+  }
+  return false;
+}
+
 void ESCore::execute(double currentTime, double constantFrameTime)
 {
   ++mCoreSequence;
@@ -146,10 +160,11 @@ void ESCore::execute(double currentTime, double constantFrameTime)
   renormalize(true);
   mSystems->renormalize();
 
-  // Perform garbage collection if requested.
+  // Perform garbage collection if requested and safe
   if(runGC)
   {
-    runCompleteGC();
+    if(!hasGeomPromise())
+      runCompleteGC();
     runGC = false;
   }
 

src/Interface/Modules/Render/ES/Core.h

@@ -49,6 +49,7 @@ namespace Render {
   void runGCOnNextExecution(){runGC = true;}
 
 private:
+  bool hasGeomPromise() const;
 
   int64_t         mCoreSequence;    ///< Sequence number (frame) since start.
   spire::GLState  mDefaultGLState;  ///< Default OpenGL state.

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -839,12 +839,14 @@ namespace SCIRun {
 
       DEBUG_LOG_LINE_INFO
 
-      std::weak_ptr<ren::VBOMan> vm = mCore.getStaticComponent<ren::StaticVBOMan>()->instance_;
-      std::weak_ptr<ren::IBOMan> im = mCore.getStaticComponent<ren::StaticIBOMan>()->instance_;
-      if (std::shared_ptr<ren::VBOMan> vboMan = vm.lock())
+      auto vmc = mCore.getStaticComponent<ren::StaticVBOMan>();
+      auto imc = mCore.getStaticComponent<ren::StaticIBOMan>();
+      if(!vmc || !imc) return;
+
+      if (std::shared_ptr<ren::VBOMan> vboMan = vmc->instance_)
       {
         DEBUG_LOG_LINE_INFO;
-        if (std::shared_ptr<ren::IBOMan> iboMan = im.lock())
+        if (std::shared_ptr<ren::IBOMan> iboMan = imc->instance_)
         {
           DEBUG_LOG_LINE_INFO
           if (foundObject != mSRObjects.end())