Skip to content

Commit

Permalink
Merge pull request #682 from CesiumGS/prevent-save-stage-prompt
Browse files Browse the repository at this point in the history
Prevent save stage dialog when reloading Fabric stage
  • Loading branch information
lilleyse authored Feb 14, 2024
2 parents e57d1e7 + bd06452 commit e74b1c6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Fixed crash when updating tilesets shader inputs.
* Fixed crash when setting certain `/Cesium` debug options at runtime.
* Fixed crash when disabling and re-enabling the extension.
* Fixed a bug where save stage dialog would appear when reloading Fabric stage at startup.
* Fixed crash when removing USD prims in certain order.
* Fixed issue where Cesium ion session would not resume on reload.
* The movie capture tool now waits for tilesets to complete loading before it captures a frame.
Expand Down
6 changes: 5 additions & 1 deletion exts/cesium.omniverse/cesium/omniverse/usdUtils/usdUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,11 @@ def get_path_to_current_ion_server() -> Optional[str]:
def set_path_to_current_ion_server(path: str) -> None:
data = get_or_create_cesium_data()
rel = data.GetSelectedIonServerRel()
rel.SetTargets([path])

# This check helps avoid sending unnecessary USD notifications
# See https://github.com/CesiumGS/cesium-omniverse/issues/640
if get_path_to_current_ion_server() != path:
rel.SetTargets([path])


def get_tileset_paths() -> List[str]:
Expand Down
2 changes: 0 additions & 2 deletions src/core/src/Context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ void Context::clearStage() {
}

void Context::reloadStage() {
const auto defaultIonServerPath = pxr::SdfPath("/CesiumServers/IonOfficial");

clearStage();

// Populate the asset registry from prims already on the stage
Expand Down

0 comments on commit e74b1c6

Please sign in to comment.