Skip to content

Commit

Permalink
Compilation fix from latest o3de/development branch (#317)
Browse files Browse the repository at this point in the history
* Fix compile error caused by ebuse signature change of 'AZ::SceneAPI::Events::SceneSerialization::LoadScene'
* Set the commit to validate code against to 773da3a12364dc4bbab162798ecc496874c71901 for current o3de development 2022-11-10
* Update o3de commit validation hash to 932a0327a58580028bb4a314b2d464dd974edaef

Signed-off-by: Steve Pham <[email protected]>
  • Loading branch information
spham-amzn authored Nov 14, 2022
1 parent 700af7e commit 2ee202f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 60
env:
# vv Change the o3de hash (LONG FORMAT!) here to fit the build vv
O3DE_SHA: bb79fa363586e907de7c736dee554fbdae6e570d
O3DE_SHA: 932a0327a58580028bb4a314b2d464dd974edaef
ROS_DISTRO: galactic
steps:
- name: O3DE ROS 2 Gem checkout
Expand Down
2 changes: 1 addition & 1 deletion Code/Source/RobotImporter/URDF/CollidersMaker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace ROS2

AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> scene;
AZ::SceneAPI::Events::SceneSerializationBus::BroadcastResult(
scene, &AZ::SceneAPI::Events::SceneSerialization::LoadScene, azMeshPath.c_str(), AZ::Uuid::CreateNull());
scene, &AZ::SceneAPI::Events::SceneSerialization::LoadScene, azMeshPath.c_str(), AZ::Uuid::CreateNull(), "");
if (!scene)
{
AZ_Error(
Expand Down

0 comments on commit 2ee202f

Please sign in to comment.