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

remove code that loads member variables on SC editor component twice (#7506)

Browse Source 
* remove code that loads member variables on SC editor component twice

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix unused variable release build error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2022-02-09 14:45:56 -08:00
committed by GitHub
parent caae0b0ec3
commit 51bac9a6c0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.cpp
+3 -5
View File
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <AzCore/Serialization/Json/JsonSerialization.h>
#include <ScriptCanvas/Asset/RuntimeAsset.h>
#include <ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.h>
@@ -17,7 +17,7 @@ namespace AZ
JsonSerializationResult::Result EditorScriptCanvasComponentSerializer::Load
( void* outputValue
, const Uuid& outputValueTypeId
, [[maybe_unused]] const Uuid& outputValueTypeId
, const rapidjson::Value& inputValue
, JsonDeserializerContext& context)
{
@@ -32,9 +32,7 @@ namespace AZ
JsonSerializationResult::ResultCode result = BaseJsonSerializer::Load(outputValue
, azrtti_typeid<AzToolsFramework::Components::EditorComponentBase>(), inputValue, context);
// load child data one by one...
result.Combine(BaseJsonSerializer::Load(outputValue, outputValueTypeId, inputValue, context));
// load child data one by one
if (result.GetProcessing() != JSR::Processing::Halted)
{
result.Combine(ContinueLoadingFromJsonObjectField