Skip to content

Commit db02677

Browse files
author
Roberto De Ioris
committed
build fixes
1 parent 4fd5090 commit db02677

3 files changed

Lines changed: 1 addition & 19 deletions

File tree

‎Source/UnrealEnginePython/Private/UEPyModule.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ static PyMethodDef ue_PyUObject_methods[] = {
506506
{ "get_raw_animation_data", (PyCFunction)py_ue_anim_sequence_get_raw_animation_data, METH_VARARGS, "" },
507507
{ "get_raw_animation_track", (PyCFunction)py_ue_anim_sequence_get_raw_animation_track, METH_VARARGS, "" },
508508
{ "add_new_raw_track", (PyCFunction)py_ue_anim_sequence_add_new_raw_track, METH_VARARGS, "" },
509-
{ "add_anim_composite_section", (PyCFunction)py_ue_add_anim_composite_section, METH_VARARGS, "" },
510509
#endif
511510
{ "add_anim_composite_section", (PyCFunction)py_ue_add_anim_composite_section, METH_VARARGS, "" },
512511
#endif

‎Source/UnrealEnginePython/Private/UObject/UEPyAnimSequence.cpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,6 @@ PyObject *py_ue_anim_set_skeleton(ue_PyUObject * self, PyObject * args) {
134134
Py_RETURN_NONE;
135135
}
136136

137-
#if WITH_EDITOR
138-
PyObject *py_ue_add_anim_composite_section(ue_PyUObject * self, PyObject * args) {
139-
ue_py_check(self);
140-
141-
char *name;
142-
float time;
143-
if (!PyArg_ParseTuple(args, "sf:add_anim_composite_section", &name, &time))
144-
return nullptr;
145-
146-
UAnimMontage *anim = ue_py_check_type<UAnimMontage>(self);
147-
if (!anim)
148-
return PyErr_Format(PyExc_Exception, "UObject is not a UAnimMontage.");
149-
150-
return PyLong_FromLong(anim->AddAnimCompositeSection(FName(UTF8_TO_TCHAR(name)), time));
151-
}
152-
#endif
153-
154137
PyObject *py_ue_get_blend_parameter(ue_PyUObject * self, PyObject * args) {
155138
ue_py_check(self);
156139

‎Source/UnrealEnginePython/Private/UnrealEnginePython.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ void FUnrealEnginePythonModule::StartupModule()
234234
if (!FPaths::DirectoryExists(ScriptsPath)) {
235235
IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
236236
PlatformFile.CreateDirectory(*ScriptsPath);
237+
}
237238

238239
// To ensure there are no path conflicts, if we have a valid python home at this point,
239240
// we override the current environment entirely with the environment we want to use,
@@ -272,7 +273,6 @@ void FUnrealEnginePythonModule::StartupModule()
272273
PathVars.Append(OurPythonPaths);
273274
FString ModifiedPath = FString::Join(PathVars, PathDelimiter);
274275
FPlatformMisc::SetEnvironmentVar(TEXT("PATH"), *ModifiedPath);
275-
>>>>>>> 080faa94f9c97ddbb1185001c9603d37d4811525
276276
}
277277

278278
Py_Initialize();

0 commit comments

Comments
 (0)