From 52f533a8739ca41ae3e79ea4e9d5a9e53874fdcf Mon Sep 17 00:00:00 2001 From: ryanmayeda Date: Wed, 16 Nov 2022 11:02:06 -0800 Subject: [PATCH 1/3] Update README.md Updated docs link for UE 5.x. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a81330..83600d3 100644 --- a/README.md +++ b/README.md @@ -66,5 +66,5 @@ Then the following files (or similar) need to be modified to add the Unreal inte ## See also: -For more information on how to run the ShotGrid/Unreal integration, please see the [support documentation](https://docs.unrealengine.com/4.27/en-US/ProductionPipelines/UsingUnrealEnginewithAutodeskShotGrid). +For more information on how to run the ShotGrid/Unreal integration, please see the [support documentation](https://docs.unrealengine.com/5.0/en-US/using-unreal-engine-with-autodesk-shotgrid/). From 729f6b590a6ee450b53dafba5301d2b44528cbf9 Mon Sep 17 00:00:00 2001 From: Stephane Deverly Date: Thu, 25 Apr 2024 18:42:56 +0200 Subject: [PATCH 2/3] For #13673, wip --- engine.py | 13 +++++++------ startup.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engine.py b/engine.py index 35c0d08..9ddccfb 100644 --- a/engine.py +++ b/engine.py @@ -106,13 +106,14 @@ def init_engine(self): def init_qt_app(self): self.logger.debug("%s: Initializing QtApp for Unreal", self) - from sgtk.platform.qt5 import QtWidgets - if not QtWidgets.QApplication.instance(): - self._qt_app = QtWidgets.QApplication(sys.argv) + from sgtk.platform.qt import QtGui + + if not QtGui.QApplication.instance(): + self._qt_app = QtGui.QApplication(sys.argv) self._qt_app.setQuitOnLastWindowClosed(False) else: - self._qt_app = QtWidgets.QApplication.instance() + self._qt_app = QtGui.QApplication.instance() # On other platforms than Windows, we need to process the Qt events otherwise # UIs are "frozen". We use a slate tick callback to do that on a regular basis. @@ -131,8 +132,8 @@ def _process_qt_events_cb(delta_time): :param float delta_time: delta time since the last run. """ - from sgtk.platform.qt5 import QtWidgets - qapp = QtWidgets.QApplication.instance() + from sgtk.platform.qt import QtGui + qapp = QtGui.QApplication.instance() if qapp: qapp.processEvents() diff --git a/startup.py b/startup.py index 483eb79..8ccb738 100644 --- a/startup.py +++ b/startup.py @@ -72,7 +72,7 @@ def prepare_launch(self, exec_path, args, file_to_open=None): # SG TK integration for now, just run the executable with its args. This # allows to launch Unreal from tk-desktop or submit turntable renders # from Maya to Unreal, without the integration crashing Unreal. - if sys.platform == "darwin": + if False and sys.platform == "darwin": self.logger.warning("SG TK Unreal integration is not available on Mac.") return LaunchInformation(exec_path, args, required_env) From ed2575f4c7b5ce29ad18af34260384d8caa210f4 Mon Sep 17 00:00:00 2001 From: Stephane Deverly Date: Fri, 26 Apr 2024 18:05:20 +0200 Subject: [PATCH 3/3] For #13673, put back Mac protection --- startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup.py b/startup.py index 8ccb738..483eb79 100644 --- a/startup.py +++ b/startup.py @@ -72,7 +72,7 @@ def prepare_launch(self, exec_path, args, file_to_open=None): # SG TK integration for now, just run the executable with its args. This # allows to launch Unreal from tk-desktop or submit turntable renders # from Maya to Unreal, without the integration crashing Unreal. - if False and sys.platform == "darwin": + if sys.platform == "darwin": self.logger.warning("SG TK Unreal integration is not available on Mac.") return LaunchInformation(exec_path, args, required_env)