From 51bac9a6c01426a5bd27904e3e9e8bfcd1622903 Mon Sep 17 00:00:00 2001 From: carlitosan <82187351+carlitosan@users.noreply.github.com> Date: Wed, 9 Feb 2022 14:45:56 -0800 Subject: [PATCH] remove code that loads member variables on SC editor component twice (#7506) * 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> --- .../Components/EditorScriptCanvasComponentSerializer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.cpp b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.cpp index 596c2d9dbf..069b7a5f48 100644 --- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ - + #include #include #include @@ -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(), 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