Skip to content

Commit 133ddb3

Browse files
committed
release 1.7.4
1 parent 77b5f29 commit 133ddb3

11 files changed

Lines changed: 25 additions & 14 deletions

File tree

DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static void WriteEscapedString(TSelf* Self, const FString& Str)
222222
{
223223
if (StringSourceUtils::IsControl(Ch))
224224
{
225-
const static TCHAR _CONTROL_ESCAPE_FMT[] = { '\\', 'u', '%', '0', '4', 'x', 0 };
225+
constexpr static TCHAR _CONTROL_ESCAPE_FMT[] = { '\\', 'u', '%', '0', '4', 'x', 0 };
226226
Escaped.Appendf(_CONTROL_ESCAPE_FMT, Ch);
227227
}
228228
else
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#pragma once
22

3-
#define DATA_CONFIG_CORE_VERSION "1.7.3"
4-
#define DATA_CONFIG_CORE_VERSION_NUMBER 10703
3+
#define DATA_CONFIG_CORE_VERSION "1.7.4"
4+
#define DATA_CONFIG_CORE_VERSION_NUMBER 10704

DataConfig/Source/DataConfigEditorExtra/Private/DataConfig/EditorExtra/Deserialize/DcDeserializeGameplayAbility.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ TSharedRef<FExtender> GameplayAbilityEffectExtender(const TArray<FAssetData>& Se
216216

217217
FDcResult Ret = SelectJSONAndLoadIntoBlueprintCDO(Asset, [](UBlueprint* Blueprint, FDcReader& Reader)
218218
{
219-
UGameplayAbility* AbilityCDO = CastChecked<UGameplayAbility>(Blueprint->GeneratedClass->ClassDefaultObject);
219+
UGameplayAbility* AbilityCDO = GetMutableDefault<UGameplayAbility>(Blueprint->GeneratedClass);
220220
return DeserializeGameplayAbility(AbilityCDO, Reader);
221221
});
222222

@@ -249,7 +249,7 @@ TSharedRef<FExtender> GameplayAbilityEffectExtender(const TArray<FAssetData>& Se
249249

250250
FDcResult Ret = SelectJSONAndLoadIntoBlueprintCDO(Asset, [](UBlueprint* Blueprint, FDcReader& Reader)
251251
{
252-
UGameplayEffect* EffectCDO = CastChecked<UGameplayEffect>(Blueprint->GeneratedClass->ClassDefaultObject);
252+
UGameplayEffect* EffectCDO = GetMutableDefault<UGameplayEffect>(Blueprint->GeneratedClass);
253253
return DeserializeGameplayEffect(EffectCDO, Reader);
254254
});
255255

DataConfig/Source/DataConfigEditorExtra/Private/DataConfig/EditorExtra/Editor/DcEditorDumpAssetToLog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TSharedRef<FExtender> DumpAssetToLogExtender(const TArray<FAssetData>& SelectedA
2626
if (UBlueprint* Blueprint = Cast<UBlueprint>(Asset.GetAsset()))
2727
{
2828
// dump BP class generated class CDO as it makes more sense
29-
DcAutomationUtils::DumpToLog(FDcPropertyDatum(Blueprint->GeneratedClass->ClassDefaultObject));
29+
DcAutomationUtils::DumpToLog(FDcPropertyDatum(GetMutableDefault<UObject>(Blueprint->GeneratedClass)));
3030
}
3131
else
3232
{

DataConfig/Source/DataConfigEngineExtra/Private/DataConfig/EngineExtra/SerDe/DcSerDeBlueprint.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,7 @@ DC_TEST("DataConfig.EngineExtra.BPClassInstance")
857857
return true;
858858
}
859859

860+
#if WITH_EDITOR
860861
DC_TEST("DataConfig.EngineExtra.BPStructInstance")
861862
{
862863
using namespace DcExtra;
@@ -933,4 +934,4 @@ DC_TEST("DataConfig.EngineExtra.BPStructInstance")
933934

934935
return true;
935936
}
936-
937+
#endif // WITH_EDITOR

DataConfig/Source/DataConfigTests/Private/DcTestMsgPack.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static FDcResult RoundtripJsonMsgpackJson(FAutomationTestBase* Self, FString Str
107107

108108
static uint8* _MallocPatternMemory(int Size)
109109
{
110-
uint8* Bytes = (uint8*)GMalloc->Malloc(Size);
110+
uint8* Bytes = (uint8*)FMemory::Malloc(Size);
111111
{
112112
for (int Ix = 0; Ix <= 0xFF; Ix++)
113113
Bytes[Ix] = (uint8)Ix;
@@ -392,7 +392,7 @@ DC_TEST("DataConfig.Core.MsgPack.Blob_8_16_32")
392392
uint8* Bytes = _MallocPatternMemory(Size);
393393
ON_SCOPE_EXIT
394394
{
395-
GMalloc->Free(Bytes);
395+
FMemory::Free(Bytes);
396396
};
397397

398398
UTEST_OK("MsgPack Blob_8_16_32", _TestWriter(this, [Bytes](FDcMsgPackWriter& Writer)
@@ -527,7 +527,7 @@ DC_TEST("DataConfig.Core.MsgPack.Extension")
527527
uint8* Bytes = _MallocPatternMemory(Size);
528528
ON_SCOPE_EXIT
529529
{
530-
GMalloc->Free(Bytes);
530+
FMemory::Free(Bytes);
531531
};
532532

533533
UTEST_OK("MsgPack Roundtrip1", _TestWriter(this, [Bytes](FDcMsgPackWriter& Writer)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021-2024 Chen Tao
3+
Copyright (c) 2021-2025 Chen Tao
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Misc/Docs/Source/Advanced/UEUpgrades.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

33
DataConfig is committed to support multiple UE versions with no deprecations and warnings. On this page we'll document important upgrade and migration info.
44

5+
# UE5.6
6+
7+
- `FString::Appendf` and series of functions now do compile time check on the format string, requires the format string to be a static constexpr.
8+
- `GMalloc` access is deprecated.
9+
- 'UClass::ClassDefaultObject' is deprecated in favor of global `GetDefault<>()` or `GetMutableDefault<>()`.
10+
511
# UE5.5
612

7-
- A new series batch scripts under `Engine/Build/BatchFiles/RunUBT` is added which will will do a bunch of checks before running `UnrealBuildTool`.
13+
- A new series batch scripts named `Engine/Build/BatchFiles/RunUBT` are added which will will do a bunch of checks before running `UnrealBuildTool`.
814
One should now use `RunUBT` instead of `UnrealBuildTool` otherwise it won't work in some configuration.
915
- `EAutomationTestFlags` is now a `enum class` type.
1016
- `TIsTriviallyDestructible` is deprecated over `std::is_trivially_destructible_v`.

Misc/Docs/Source/Changes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## 1.7.4 - 2025-5-15
6+
- Initial UE 5.6 support.
7+
58
## 1.7.3 - 2024-12-25
69

710
- **FIX** Fix uninitialized struct fields which causes bogus errors.

Misc/Docs/Source/Integration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
At the moment it supports these the engine versions below:
44

5+
- UE 5.6
56
- UE 5.5
67
- UE 5.4
78
- UE 5.3

0 commit comments

Comments
 (0)