Compile fix.

nmwsharp · Mar 14, 2024 · 3421ecb · 3421ecb
1 parent 0129c2c
commit 3421ecb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/polyscope.cpp b/src/polyscope.cpp
@@ -715,11 +715,7 @@ void buildStructureGui() {
       int32_t skipCount = 0;
       for (auto& x : structureMap) {
         ImGui::SetNextItemOpen(structureMap.size() <= 8,
-<<<<<<< HEAD
-                                   ImGuiCond_FirstUseEver); // closed by default if more than 8
-=======
                                ImGuiCond_FirstUseEver); // closed by default if more than 8
->>>>>>> upstream/master
 
         if (structuresToSkip.find(x.second.get()) != structuresToSkip.end()) {
           skipCount++;

diff --git a/src/render/opengl/gl_engine.cpp b/src/render/opengl/gl_engine.cpp
@@ -2188,7 +2188,7 @@ void GLEngine::initialize() {
 void GLEngine::initializeImGui() {
   bindDisplay();
 
-  imguiContext = ImGui::CreateContext(); // must call once at start
+  ImGui::CreateContext(); // must call once at start
 
   // Set up ImGUI glfw bindings
   ImGui_ImplGlfw_InitForOpenGL(mainWindow, true);