Merge branch 'master' into dependabot/pip/fonttools-4.43.0

Author: akenmorris

Studio/Visualization/SliceView.cpp

@@ -65,10 +65,11 @@ SliceView::SliceView(Viewer *viewer) : viewer_(viewer) {
 
 //-----------------------------------------------------------------------------
 void SliceView::set_volume(std::shared_ptr<Image> volume) {
+  volume_ = volume;
   if (!volume) {
+    update_renderer();
     return;
   }
-  volume_ = volume;
   vtk_volume_ = volume->getVTKImage();
   slice_mapper_->SetInputData(vtk_volume_);
 

Studio/Visualization/Viewer.cpp

@@ -610,6 +610,7 @@ void Viewer::display_shape(std::shared_ptr<Shape> shape) {
   visible_ = true;
 
   shape_ = shape;
+  current_image_name_ = "";
 
   meshes_ = shape->get_meshes(session_->get_display_mode());