Skip to content

Commit 6258fd4

Browse files
author
Roberto De Ioris
committed
Merge branch 'master' into bebylon
2 parents 93ba6f8 + a65337b commit 6258fd4

14 files changed

Lines changed: 79 additions & 17 deletions

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxIOSettings.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyMethodDef ue_PyFbxIOSettings_methods[] = {
88
{ NULL } /* Sentinel */
@@ -74,4 +74,4 @@ ue_PyFbxIOSettings *py_ue_is_fbx_io_settings(PyObject *obj) {
7474
return (ue_PyFbxIOSettings *)obj;
7575
}
7676

77-
#endif
77+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxImporter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_importer_initialize(ue_PyFbxImporter *self, PyObject *args) {
88
char *filename;
@@ -107,4 +107,4 @@ void ue_python_init_fbx_importer(PyObject *ue_module) {
107107
PyModule_AddObject(ue_module, "FbxImporter", (PyObject *)&ue_PyFbxImporterType);
108108
}
109109

110-
#endif
110+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_manager_set_io_settings(ue_PyFbxManager *self, PyObject *args) {
88
PyObject *py_object;
@@ -101,4 +101,4 @@ void ue_python_init_fbx(PyObject *module) {
101101
}
102102

103103

104-
#endif
104+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxNode.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_node_get_child_count(ue_PyFbxNode *self, PyObject *args) {
88
return PyLong_FromLong(self->fbx_node->GetChildCount());
@@ -143,4 +143,4 @@ PyObject *py_ue_new_fbx_node(FbxNode *fbx_node) {
143143
return (PyObject *)ret;
144144
}
145145

146-
#endif
146+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxObject.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_object_get_name(ue_PyFbxObject *self, PyObject *args) {
88
return PyUnicode_FromString(self->fbx_object->GetName());
@@ -218,4 +218,4 @@ ue_PyFbxObject *py_ue_is_fbx_object(PyObject *obj) {
218218
return nullptr;
219219
return (ue_PyFbxObject *)obj;
220220
}
221-
#endif
221+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxProperty.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_property_get_name(ue_PyFbxProperty *self, PyObject *args) {
88
return PyUnicode_FromString(self->fbx_property.GetName());
@@ -101,4 +101,4 @@ ue_PyFbxProperty *py_ue_is_fbx_property(PyObject *obj) {
101101
return nullptr;
102102
return (ue_PyFbxProperty *)obj;
103103
}
104-
#endif
104+
#endif

‎Source/UnrealEnginePython/Private/Fbx/UEPyFbxScene.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if WITH_EDITOR
44

5-
#include "UePyFbx.h"
5+
#include "UEPyFbx.h"
66

77
static PyObject *py_ue_fbx_scene_get_root_node(ue_PyFbxScene *self, PyObject *args) {
88
FbxNode *fbx_node = self->fbx_scene->GetRootNode();
@@ -102,4 +102,4 @@ ue_PyFbxScene *py_ue_is_fbx_scene(PyObject *obj) {
102102
return (ue_PyFbxScene *)obj;
103103
}
104104

105-
#endif
105+
#endif

‎Source/UnrealEnginePython/Private/UEPyActor.cpp‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "UnrealEnginePythonPrivatePCH.h"
22

3-
3+
#include "Runtime/LevelSequence/Public/LevelSequenceActor.h"
4+
#include "Runtime/LevelSequence/Public/LevelSequence.h"
45

56
PyObject *py_ue_actor_has_tag(ue_PyUObject * self, PyObject * args) {
67

@@ -640,6 +641,31 @@ PyObject *py_ue_get_overlapping_actors(ue_PyUObject * self, PyObject * args) {
640641
return py_overlapping_actors;
641642
}
642643

644+
PyObject *py_ue_actor_set_level_sequence(ue_PyUObject * self, PyObject * args) {
645+
646+
ue_py_check(self);
647+
648+
PyObject *py_sequence;
649+
if (!PyArg_ParseTuple(args, "O:actor_set_level_sequence", &py_sequence)) {
650+
return NULL;
651+
}
652+
653+
ALevelSequenceActor *actor = ue_py_check_type<ALevelSequenceActor>(self);
654+
if (!actor) {
655+
return PyErr_Format(PyExc_Exception, "uobject is not a LevelSequenceActor");
656+
}
657+
658+
ULevelSequence *sequence = ue_py_check_type<ULevelSequence>(py_sequence);
659+
if (!sequence) {
660+
return PyErr_Format(PyExc_Exception, "argument is not a LevelSequence");
661+
}
662+
663+
actor->SetSequence(sequence);
664+
665+
Py_RETURN_NONE;
666+
}
667+
668+
643669
#if WITH_EDITOR
644670
PyObject *py_ue_get_editor_world_counterpart_actor(ue_PyUObject * self, PyObject * args) {
645671

‎Source/UnrealEnginePython/Private/UEPyActor.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ PyObject *py_ue_get_actor_component(ue_PyUObject *, PyObject *);
1111
PyObject *py_ue_actor_destroy(ue_PyUObject *, PyObject *);
1212
PyObject *py_ue_actor_components(ue_PyUObject *, PyObject *);
1313
PyObject *py_ue_get_actor_velocity(ue_PyUObject *, PyObject *);
14+
PyObject *py_ue_actor_set_level_sequence(ue_PyUObject *, PyObject *);
1415
#if WITH_EDITOR
1516
PyObject *py_ue_get_actor_label(ue_PyUObject *, PyObject *);
1617
PyObject *py_ue_set_actor_label(ue_PyUObject *, PyObject *);

‎Source/UnrealEnginePython/Private/UEPyModule.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
595595
{ "get_player_controller", (PyCFunction)py_ue_get_player_controller, METH_VARARGS, "" },
596596

597597
{ "get_overlapping_actors", (PyCFunction)py_ue_get_overlapping_actors, METH_VARARGS, "" },
598+
{ "actor_set_level_sequence", (PyCFunction)py_ue_actor_set_level_sequence, METH_VARARGS, "" },
598599

599600
// Pawn
600601
{ "get_controller", (PyCFunction)py_ue_pawn_get_controller, METH_VARARGS, "" },
@@ -627,6 +628,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
627628
{ "texture_set_data", (PyCFunction)py_ue_texture_set_data, METH_VARARGS, "" },
628629
{ "texture_get_width", (PyCFunction)py_ue_texture_get_width, METH_VARARGS, "" },
629630
{ "texture_get_height", (PyCFunction)py_ue_texture_get_height, METH_VARARGS, "" },
631+
{ "render_target_get_data", (PyCFunction)py_ue_render_target_get_data, METH_VARARGS, "" },
630632

631633
// Sequencer
632634
{ "sequencer_master_tracks", (PyCFunction)py_ue_sequencer_master_tracks, METH_VARARGS, "" },

0 commit comments

Comments
 (0)