rebase with master

Author: Medyan-Naser

vtkext/private/module/vtkF3DImguiActor.cxx

@@ -463,7 +463,7 @@ void vtkF3DImguiActor::RenderSceneHierarchy()
     return;
   }
 
-  constexpr float margin = F3DImguiStyle::GetDefaultMargin();
+  constexpr float margin = F3DStyle::GetDefaultMargin();
   float winWidth = this->CalculateHierarchyWidth();
   float winHeight = viewport->WorkSize.y - 2.0f * margin;
 

vtkext/private/module/vtkF3DRenderer.h

@@ -674,11 +674,8 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
   bool TimerVisible = false;
   bool FilenameVisible = false;
   bool MetaDataVisible = false;
-<<<<<<< HEAD
   bool HDRIFilenameVisible = false;
-=======
   bool SceneHierarchyVisible = false;
->>>>>>> aa51b800 (Add key bind for showing the hierarchy)
   bool CheatSheetVisible = false;
   bool ConsoleVisible = false;
   bool MinimalConsoleVisible = false;