Skip to content

Commit 482355c

Browse files
author
David
committed
Revert "Added debug prints for property conversion from or to python."
This reverts commit 7a21ace. In case wish to re-add these debug prints at some point.
1 parent 7a21ace commit 482355c

1 file changed

Lines changed: 0 additions & 60 deletions

File tree

‎Source/UnrealEnginePython/Private/UEPyModule.cpp‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,6 @@ static int ue_PyUObject_setattro(ue_PyUObject* self, PyObject* attr_name, PyObje
13651365
FProperty* f_property = u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(attr)));
13661366
if (f_property)
13671367
{
1368-
EXTRA_UE_LOG(LogPython, Warning, TEXT("Setting attr found %s"), UTF8_TO_TCHAR(attr));
13691368
#ifdef EXTRA_DEBUG_CODE
13701369
if (!strcmp(attr, "TargetType"))
13711370
{
@@ -2513,7 +2512,6 @@ PyObject* ue_py_convert_property(FProperty* prop, uint8* buffer, int32 index)
25132512
if (auto casted_prop = CastField<FBoolProperty>(prop))
25142513
{
25152514
bool value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2516-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: bool %d"), value);
25172515
if (value)
25182516
{
25192517
Py_RETURN_TRUE;
@@ -2523,56 +2521,45 @@ PyObject* ue_py_convert_property(FProperty* prop, uint8* buffer, int32 index)
25232521

25242522
if (auto casted_prop = CastField<FIntProperty>(prop))
25252523
{
2526-
// well I thought there was an issue here but turns out this is fine - its the test_blueprint.py thats wrong
2527-
//void* prop_addr = casted_prop->ContainerPtrToValuePtr<void>(buffer, index);
2528-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: number int %p (%p) %x"), buffer, prop_addr, *((uint64*)prop_addr));
2529-
//int value = casted_prop->GetPropertyValue(prop_addr);
25302524
int value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2531-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: int %d %x"), value, value);
25322525
return PyLong_FromLong(value);
25332526
}
25342527

25352528
if (auto casted_prop = CastField<FUInt32Property>(prop))
25362529
{
25372530
uint32 value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2538-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: uint %d"), value);
25392531
return PyLong_FromUnsignedLong(value);
25402532
}
25412533

25422534
if (auto casted_prop = CastField<FInt64Property>(prop))
25432535
{
25442536
long long value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2545-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: ull %lld"), value);
25462537
return PyLong_FromLongLong(value);
25472538
}
25482539

25492540
// this is likely a bug - it was a FInt64Property before
25502541
if (auto casted_prop = CastField<FUInt64Property>(prop))
25512542
{
25522543
uint64 value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2553-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: uint64 %lld"), value);
25542544
return PyLong_FromUnsignedLongLong(value);
25552545
}
25562546

25572547
if (auto casted_prop = CastField<FFloatProperty>(prop))
25582548
{
25592549
float value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2560-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: float %f"), value);
25612550
return PyFloat_FromDouble(value);
25622551
}
25632552

25642553
if (auto casted_prop = CastField<FByteProperty>(prop))
25652554
{
25662555
uint8 value = casted_prop->GetPropertyValue_InContainer(buffer, index);
2567-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: uint8 %d"), value);
25682556
return PyLong_FromUnsignedLong(value);
25692557
}
25702558

25712559
if (auto casted_prop = CastField<FEnumProperty>(prop))
25722560
{
25732561
void* prop_addr = casted_prop->ContainerPtrToValuePtr<void>(buffer, index);
25742562
uint64 enum_index = casted_prop->GetUnderlyingProperty()->GetUnsignedIntPropertyValue(prop_addr);
2575-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: enum %lld"), enum_index);
25762563
return PyLong_FromUnsignedLong(enum_index);
25772564
}
25782565

@@ -2753,11 +2740,9 @@ PyObject* ue_py_convert_property(FProperty* prop, uint8* buffer, int32 index)
27532740
// convert a python object to a property
27542741
bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, int32 index)
27552742
{
2756-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject"));
27572743

27582744
if (PyBool_Check(py_obj))
27592745
{
2760-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: bool"));
27612746
auto casted_prop = CastField<FBoolProperty>(prop);
27622747
if (!casted_prop)
27632748
return false;
@@ -2774,25 +2759,16 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
27742759

27752760
if (PyNumber_Check(py_obj))
27762761
{
2777-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: number"));
27782762
if (auto casted_prop = CastField<FIntProperty>(prop))
27792763
{
27802764
PyObject* py_long = PyNumber_Long(py_obj);
2781-
//void* prop_addr = casted_prop->ContainerPtrToValuePtr<void>(buffer, index);
2782-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: number int %p (%p) %ld"), buffer, prop_addr, PyLong_AsLong(py_long));
2783-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: number int %p (%p) %x"), buffer, prop_addr, *((uint64*)prop_addr));
2784-
//casted_prop->SetIntPropertyValue(prop_addr, (int64) PyLong_AsLong(py_long));
27852765
casted_prop->SetPropertyValue_InContainer(buffer, PyLong_AsLong(py_long), index);
27862766
Py_DECREF(py_long);
2787-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_property: number int %p (%p) %x"), buffer, prop_addr, *((uint64*)prop_addr));
27882767
return true;
27892768
}
27902769
if (auto casted_prop = CastField<FUInt32Property>(prop))
27912770
{
27922771
PyObject* py_long = PyNumber_Long(py_obj);
2793-
//void* prop_addr = casted_prop->ContainerPtrToValuePtr<void>(buffer, index);
2794-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: number uint %p (%p) %ld"), buffer, prop_addr, PyLong_AsUnsignedLong(py_long));
2795-
//casted_prop->SetIntPropertyValue(prop_addr, (uint64) PyLong_AsUnsignedLong(py_long));
27962772
casted_prop->SetPropertyValue_InContainer(buffer, PyLong_AsUnsignedLong(py_long), index);
27972773
Py_DECREF(py_long);
27982774
return true;
@@ -2801,23 +2777,20 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
28012777
{
28022778
PyObject* py_long = PyNumber_Long(py_obj);
28032779
casted_prop->SetPropertyValue_InContainer(buffer, PyLong_AsLongLong(py_long), index);
2804-
//casted_prop->SetIntPropertyValue(buffer, PyLong_AsLongLong(py_long), index);
28052780
Py_DECREF(py_long);
28062781
return true;
28072782
}
28082783
if (auto casted_prop = CastField<FInt64Property>(prop))
28092784
{
28102785
PyObject* py_long = PyNumber_Long(py_obj);
28112786
casted_prop->SetPropertyValue_InContainer(buffer, PyLong_AsUnsignedLongLong(py_long), index);
2812-
//casted_prop->SetIntPropertyValue(buffer, PyLong_AsUnsignedLongLong(py_long), index);
28132787
Py_DECREF(py_long);
28142788
return true;
28152789
}
28162790
if (auto casted_prop = CastField<FFloatProperty>(prop))
28172791
{
28182792
PyObject* py_float = PyNumber_Float(py_obj);
28192793
casted_prop->SetPropertyValue_InContainer(buffer, PyFloat_AsDouble(py_float), index);
2820-
//casted_prop->SetFloatingPointPropertyValue(buffer, PyFloat_AsDouble(py_float), index);
28212794
Py_DECREF(py_float);
28222795
return true;
28232796
}
@@ -2837,14 +2810,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
28372810
return true;
28382811
}
28392812

2840-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: number FAILED"));
2841-
28422813
return false;
28432814
}
28442815

28452816
if (PyUnicodeOrString_Check(py_obj))
28462817
{
2847-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: string"));
28482818
if (auto casted_prop = CastField<FStrProperty>(prop))
28492819
{
28502820
casted_prop->SetPropertyValue_InContainer(buffer, UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(py_obj)), index);
@@ -2860,13 +2830,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
28602830
casted_prop->SetPropertyValue_InContainer(buffer, FText::FromString(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(py_obj))), index);
28612831
return true;
28622832
}
2863-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: string FAILED"));
28642833
return false;
28652834
}
28662835

28672836
if (PyBytes_Check(py_obj))
28682837
{
2869-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: bytes"));
28702838
if (auto casted_prop = CastField<FArrayProperty>(prop))
28712839
{
28722840
FScriptArrayHelper_InContainer helper(casted_prop, buffer, index);
@@ -2894,13 +2862,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
28942862
}
28952863
}
28962864

2897-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: bytes FAILED"));
28982865
return false;
28992866
}
29002867

29012868
if (PyByteArray_Check(py_obj))
29022869
{
2903-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: array"));
29042870
if (auto casted_prop = CastField<FArrayProperty>(prop))
29052871
{
29062872
FScriptArrayHelper_InContainer helper(casted_prop, buffer, index);
@@ -2929,13 +2895,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
29292895
}
29302896
}
29312897

2932-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: bytearray FAILED"));
29332898
return false;
29342899
}
29352900

29362901
if (PyList_Check(py_obj))
29372902
{
2938-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: list"));
29392903
if (auto casted_prop = CastField<FArrayProperty>(prop))
29402904
{
29412905
FScriptArrayHelper_InContainer helper(casted_prop, buffer, index);
@@ -2964,13 +2928,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
29642928
return true;
29652929
}
29662930

2967-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: list FAILED"));
29682931
return false;
29692932
}
29702933

29712934
if (PyTuple_Check(py_obj))
29722935
{
2973-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: tuple"));
29742936
if (auto casted_prop = CastField<FArrayProperty>(prop))
29752937
{
29762938
FScriptArrayHelper_InContainer helper(casted_prop, buffer, index);
@@ -2999,13 +2961,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
29992961
return true;
30002962
}
30012963

3002-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: tuple FAILED"));
30032964
return false;
30042965
}
30052966

30062967
if (PyDict_Check(py_obj))
30072968
{
3008-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: dict"));
30092969
if (auto casted_prop = CastField<FMapProperty>(prop))
30102970
{
30112971
FScriptMapHelper_InContainer map_helper(casted_prop, buffer, index);
@@ -3036,15 +2996,13 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
30362996
return true;
30372997
}
30382998

3039-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: dict FAILED"));
30402999
return false;
30413000
}
30423001

30433002
// structs
30443003

30453004
if (ue_PyFVector * py_vec = py_ue_is_fvector(py_obj))
30463005
{
3047-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: fvector"));
30483006
if (auto casted_prop = CastField<FStructProperty>(prop))
30493007
{
30503008
if (casted_prop->Struct == TBaseStructure<FVector>::Get())
@@ -3053,13 +3011,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
30533011
return true;
30543012
}
30553013
}
3056-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: fvector FAILED"));
30573014
return false;
30583015
}
30593016

30603017
if (ue_PyFVector2D * py_vec = py_ue_is_fvector2d(py_obj))
30613018
{
3062-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: fvector2D"));
30633019
if (auto casted_prop = CastField<FStructProperty>(prop))
30643020
{
30653021
if (casted_prop->Struct == TBaseStructure<FVector2D>::Get())
@@ -3068,13 +3024,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
30683024
return true;
30693025
}
30703026
}
3071-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: fvector2D FAILED"));
30723027
return false;
30733028
}
30743029

30753030
if (ue_PyFRotator * py_rot = py_ue_is_frotator(py_obj))
30763031
{
3077-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: frotator"));
30783032
if (auto casted_prop = CastField<FStructProperty>(prop))
30793033
{
30803034
if (casted_prop->Struct == TBaseStructure<FRotator>::Get())
@@ -3083,13 +3037,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
30833037
return true;
30843038
}
30853039
}
3086-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: frotator FAILED"));
30873040
return false;
30883041
}
30893042

30903043
if (ue_PyFTransform * py_transform = py_ue_is_ftransform(py_obj))
30913044
{
3092-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: ftransform"));
30933045
if (auto casted_prop = CastField<FStructProperty>(prop))
30943046
{
30953047
if (casted_prop->Struct == TBaseStructure<FTransform>::Get())
@@ -3098,13 +3050,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
30983050
return true;
30993051
}
31003052
}
3101-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: ftransform FAILED"));
31023053
return false;
31033054
}
31043055

31053056
if (ue_PyFColor * py_color = py_ue_is_fcolor(py_obj))
31063057
{
3107-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: fcolor"));
31083058
if (auto casted_prop = CastField<FStructProperty>(prop))
31093059
{
31103060
if (casted_prop->Struct == TBaseStructure<FColor>::Get())
@@ -3114,13 +3064,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
31143064
return true;
31153065
}
31163066
}
3117-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: fcolor FAILED"));
31183067
return false;
31193068
}
31203069

31213070
if (ue_PyFLinearColor * py_color = py_ue_is_flinearcolor(py_obj))
31223071
{
3123-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: flinearcolor"));
31243072
if (auto casted_prop = CastField<FStructProperty>(prop))
31253073
{
31263074
if (casted_prop->Struct == TBaseStructure<FLinearColor>::Get())
@@ -3129,13 +3077,11 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
31293077
return true;
31303078
}
31313079
}
3132-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: flinearcolor FAILED"));
31333080
return false;
31343081
}
31353082

31363083
if (ue_PyFHitResult * py_hit = py_ue_is_fhitresult(py_obj))
31373084
{
3138-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: fhitresult"));
31393085
if (auto casted_prop = CastField<FStructProperty>(prop))
31403086
{
31413087
if (casted_prop->Struct == FHitResult::StaticStruct())
@@ -3144,14 +3090,12 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
31443090
return true;
31453091
}
31463092
}
3147-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: fhitresult FAILED"));
31483093
return false;
31493094
}
31503095

31513096
// generic structs
31523097
if (py_ue_is_uscriptstruct(py_obj))
31533098
{
3154-
//EXTRA_UE_LOG(LogPython, Warning, TEXT("ue_py_convert_pyobject: uscriptstruct"));
31553099
ue_PyUScriptStruct* py_u_struct = (ue_PyUScriptStruct*)py_obj;
31563100
if (auto casted_prop = CastField<FStructProperty>(prop))
31573101
{
@@ -3163,7 +3107,6 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
31633107
return true;
31643108
}
31653109
}
3166-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: uscriptstruct FAILED"));
31673110
return false;
31683111
}
31693112

@@ -3217,7 +3160,6 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
32173160
return true;
32183161
}
32193162

3220-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: uclass FAILED"));
32213163
return false;
32223164
}
32233165

@@ -3264,7 +3206,6 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
32643206
return true;
32653207
}
32663208
}
3267-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: uobject FAILED"));
32683209
return false;
32693210
}
32703211

@@ -3286,7 +3227,6 @@ bool ue_py_convert_pyobject(PyObject* py_obj, FProperty* prop, uint8* buffer, in
32863227

32873228
return true;
32883229
}
3289-
EXTRA_UE_LOG(LogPython, Error, TEXT("ue_py_convert_pyobject: Py_None FAILED"));
32903230
return false;
32913231
}
32923232

0 commit comments

Comments
 (0)