|
|
|
@ -5,7 +5,7 @@
|
|
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <AzCore/Serialization/Json/JsonSerialization.h>
|
|
|
|
#include <AzCore/Serialization/Json/JsonSerialization.h>
|
|
|
|
#include <ScriptCanvas/Asset/RuntimeAsset.h>
|
|
|
|
#include <ScriptCanvas/Asset/RuntimeAsset.h>
|
|
|
|
#include <ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.h>
|
|
|
|
#include <ScriptCanvas/Components/EditorScriptCanvasComponentSerializer.h>
|
|
|
|
@ -17,7 +17,7 @@ namespace AZ
|
|
|
|
|
|
|
|
|
|
|
|
JsonSerializationResult::Result EditorScriptCanvasComponentSerializer::Load
|
|
|
|
JsonSerializationResult::Result EditorScriptCanvasComponentSerializer::Load
|
|
|
|
( void* outputValue
|
|
|
|
( void* outputValue
|
|
|
|
, const Uuid& outputValueTypeId
|
|
|
|
, [[maybe_unused]] const Uuid& outputValueTypeId
|
|
|
|
, const rapidjson::Value& inputValue
|
|
|
|
, const rapidjson::Value& inputValue
|
|
|
|
, JsonDeserializerContext& context)
|
|
|
|
, JsonDeserializerContext& context)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -32,9 +32,7 @@ namespace AZ
|
|
|
|
JsonSerializationResult::ResultCode result = BaseJsonSerializer::Load(outputValue
|
|
|
|
JsonSerializationResult::ResultCode result = BaseJsonSerializer::Load(outputValue
|
|
|
|
, azrtti_typeid<AzToolsFramework::Components::EditorComponentBase>(), inputValue, context);
|
|
|
|
, azrtti_typeid<AzToolsFramework::Components::EditorComponentBase>(), inputValue, context);
|
|
|
|
|
|
|
|
|
|
|
|
// load child data one by one...
|
|
|
|
// load child data one by one
|
|
|
|
result.Combine(BaseJsonSerializer::Load(outputValue, outputValueTypeId, inputValue, context));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (result.GetProcessing() != JSR::Processing::Halted)
|
|
|
|
if (result.GetProcessing() != JSR::Processing::Halted)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
result.Combine(ContinueLoadingFromJsonObjectField
|
|
|
|
result.Combine(ContinueLoadingFromJsonObjectField
|
|
|
|
|