Merge branch 'master' of github.com:gwaldron/osgearth

gwaldron · Jan 23, 2024 · 23f2a76 · 23f2a76
2 parents cab30a1 + 921c86b
commit 23f2a76
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/src/osgEarth/ImGui/ContentBrowserGUI b/src/osgEarth/ImGui/ContentBrowserGUI
@@ -174,25 +174,26 @@ namespace osgEarth {
                 if (!_selectedFilename.empty() && !_currentTexture.valid() && !_currentNode.valid())
                 {
                     ImGui::Text("Couldn't load %s", _selectedFilename.c_str());
-                    return;
                 }
-
-                if (_currentTexture.valid())
+                else
                 {
-                    ImGuiUtil::Texture(_currentTexture.get(), ri, 250, 0);
-                    osg::Image* image = _currentTexture->getImage();
-                    ImGui::Text(image->getFileName().c_str());
-                    ImGui::Text("Dimensions: %d x %d", image->s(), image->t());
-                    ImGui::Text("Compressed: %s", image->isCompressed() ? "Yes" : "No");                    
-                    ImGui::Text("Data Type: %s", getGLString(image->getDataType()).c_str());
-                    ImGui::Text("Texture Format: %s", getGLString(image->getInternalTextureFormat()).c_str());
-                    ImGui::Text("Mipmap Levels: %d", image->getNumMipmapLevels());
-                    ImGui::Text("Pixel Format: %s", getGLString(image->getPixelFormat()).c_str());
-                }
+                    if (_currentTexture.valid())
+                    {
+                        ImGuiUtil::Texture(_currentTexture.get(), ri, 250, 0);
+                        osg::Image* image = _currentTexture->getImage();
+                        ImGui::Text(image->getFileName().c_str());
+                        ImGui::Text("Dimensions: %d x %d", image->s(), image->t());
+                        ImGui::Text("Compressed: %s", image->isCompressed() ? "Yes" : "No");
+                        ImGui::Text("Data Type: %s", getGLString(image->getDataType()).c_str());
+                        ImGui::Text("Texture Format: %s", getGLString(image->getInternalTextureFormat()).c_str());
+                        ImGui::Text("Mipmap Levels: %d", image->getNumMipmapLevels());
+                        ImGui::Text("Pixel Format: %s", getGLString(image->getPixelFormat()).c_str());
+                    }
 
-                if (_currentNode.valid())
-                {
-                    ImGui::Text("Loaded Node");
+                    if (_currentNode.valid())
+                    {
+                        ImGui::Text("Loaded Node");
+                    }
                 }
                 ImGui::EndChild();
             }