birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix reserve call that should have been resize - add extra handling to output error

Browse Source
This commit is contained in:
hultonha
2021-04-15 18:17:02 +01:00
parent 7c5f7181eb
commit 7ff0c5c33a
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp
+10 -2
View File
@@ -86,7 +86,7 @@ namespace WhiteBox
{
success = assetHandler->SaveAssetData(meshAsset, &fileStream);
AZ_Printf(
"EditorWhiteBoxComponent", "Save %s. Location: %s", success ? "succeeded" : "failed",
"EditorWhiteBoxMeshAsset", "Save %s. Location: %s", success ? "succeeded" : "failed",
absoluteFilePath.c_str());
}
}
@@ -229,7 +229,15 @@ namespace WhiteBox
{
if (asset == m_meshAsset)
{
AZ_Warning("EditorWhiteBoxComponent", false, "OnAssetError: %s", asset.GetHint().c_str());
AZ_Warning("EditorWhiteBoxMeshAsset", false, "OnAssetError: %s", asset.GetHint().c_str());
}
}
void EditorWhiteBoxMeshAsset::OnAssetReloadError(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
if (asset == m_meshAsset)
{
AZ_Warning("EditorWhiteBoxMeshAsset", false, "OnAssetReloadError: %s", asset.GetHint().c_str());
}
}
Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.h
+1
View File
@@ -82,6 +82,7 @@ namespace WhiteBox
void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetError(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetReloadError(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
// WhiteBoxMeshAssetNotificationBus ...
void OnWhiteBoxMeshAssetModified(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ namespace WhiteBox
const auto size = stream->GetLength();
Api::WhiteBoxMeshStream whiteBoxData;
whiteBoxData.reserve(size);
whiteBoxData.resize(size);
stream->Read(size, whiteBoxData.data());
Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
+5
View File
@@ -3407,6 +3407,11 @@ namespace WhiteBox
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
if (input.empty())
{
return false;
}
std::string inputStr;
inputStr.reserve(input.size());
AZStd::copy(input.cbegin(), input.cend(), AZStd::back_inserter(inputStr));