Skip to content

Commit

Permalink
Merge branch 'dev/dbataille/fix_ci' into 'main'
Browse files Browse the repository at this point in the history
Fix CI that crash because of a wrong ingested asset

See merge request lightspeedrtx/lightspeed-kit!694
  • Loading branch information
nvdamien committed Jul 19, 2024
2 parents 377c499 + bd4d6ac commit 89e9c6f
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- REMIX-2825: Updated renderer to the latest dxvk-remix to accomodate USD distant light import/export fixes
- Fixed highlight outline rendering if selecting non-power-of-two amount of objects
- Fix trigger pipeline
- Fix CI that crash because of a wrong ingested asset

### Removed
- REMIX-3152: Removed the delete and duplicate button icons for asset reference light items in the selection tree
Expand Down
2 changes: 1 addition & 1 deletion source/apps/lightspeed.app.trex.ingestcraft.kit
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ enabled = [
"lightspeed.pip_archive-2.0.1",
"lightspeed.project_manager.service-1.0.0",
"lightspeed.tool.material.core-1.0.5",
"lightspeed.trex.app.resources-1.5.1",
"lightspeed.trex.app.resources-1.5.2",
"lightspeed.trex.app.setup-1.0.3",
"lightspeed.trex.app.style-1.2.3",
"lightspeed.trex.asset_replacements.core.shared-2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion source/apps/lightspeed.app.trex.kit
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ enabled = [
"lightspeed.progress_popup.window-0.1.2",
"lightspeed.project_manager.service-1.0.0",
"lightspeed.tool.material.core-1.0.5",
"lightspeed.trex.app.resources-1.5.1",
"lightspeed.trex.app.resources-1.5.2",
"lightspeed.trex.app.setup-1.0.3",
"lightspeed.trex.app.style-1.2.3",
"lightspeed.trex.asset_replacements.core.shared-2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion source/apps/lightspeed.app.trex.stagecraft.kit
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ enabled = [
"lightspeed.progress_popup.window-0.1.2",
"lightspeed.project_manager.service-1.0.0",
"lightspeed.tool.material.core-1.0.5",
"lightspeed.trex.app.resources-1.5.1",
"lightspeed.trex.app.resources-1.5.2",
"lightspeed.trex.app.setup-1.0.3",
"lightspeed.trex.app.style-1.2.3",
"lightspeed.trex.asset_replacements.core.shared-2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion source/apps/lightspeed.app.trex.texturecraft.kit
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ enabled = [
"lightspeed.pip_archive-2.0.1",
"lightspeed.project_manager.service-1.0.0",
"lightspeed.tool.material.core-1.0.5",
"lightspeed.trex.app.resources-1.5.1",
"lightspeed.trex.app.resources-1.5.2",
"lightspeed.trex.app.setup-1.0.3",
"lightspeed.trex.app.style-1.2.3",
"lightspeed.trex.asset_replacements.core.shared-2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion source/apps/lightspeed.app.trex_dev.kit
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ enabled = [
"lightspeed.progress_popup.window-0.1.2",
"lightspeed.project_manager.service-1.0.0",
"lightspeed.tool.material.core-1.0.5",
"lightspeed.trex.app.resources-1.5.1",
"lightspeed.trex.app.resources-1.5.2",
"lightspeed.trex.app.setup-1.0.3",
"lightspeed.trex.app.style-1.2.3",
"lightspeed.trex.asset_replacements.core.shared-2.1.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
version = "1.5.1"
version = "1.5.2"
authors = ["[email protected]"]
repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit"
changelog = "docs/CHANGELOG.md"
Expand Down
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.5.2]
### Fixed
- Fix ingested asset hash

## [1.5.1]
### Added
- Categories icon
Expand Down

0 comments on commit 89e9c6f

Please sign in to comment.