Merge pull request #13 from GPLgithub/master

Fixes for UE api changes

Author: ryanmayeda

hooks/tk-multi-publish2/basic/collector.py

@@ -171,7 +171,7 @@ def collect_selected_assets(self, parent_item):
         sequence_edits = None
         # Iterate through the selected assets and get their info and add them as items to be published
         for asset in unreal_sg.selected_assets:
-            if asset.asset_class == "LevelSequence":
+            if asset.asset_class_path.asset_name == "LevelSequence":
                 if sequence_edits is None:
                     sequence_edits = self.retrieve_sequence_edits()
                 self.collect_level_sequence(parent_item, asset, sequence_edits)
@@ -180,8 +180,8 @@ def collect_selected_assets(self, parent_item):
                     parent_item,
                     # :class:`Name` instances, we cast them to strings otherwise
                     # string operations fail down the line..
-                    "%s" % asset.object_path,
-                    "%s" % asset.asset_class,
+                    "%s" % unreal_sg.object_path(asset),
+                    "%s" % asset.asset_class_path.asset_name,
                     "%s" % asset.asset_name,
                 )
 
@@ -255,7 +255,8 @@ def collect_level_sequence(self, parent_item, asset, sequence_edits):
         :param sequence_edits: A dictionary with  :class:`unreal.LevelSequence as keys and
                                               lists of :class:`SequenceEdit` as values.
         """
-        level_sequence = unreal.load_asset(asset.object_path)
+        unreal_sg = sgtk.platform.current_engine().unreal_sg_engine
+        level_sequence = unreal.load_asset(unreal_sg.object_path(asset))
         for edits_path in self.get_all_paths_from_sequence(level_sequence, sequence_edits):
             # Reverse the path to have it from top master sequence to the shot.
             edits_path.reverse()
@@ -284,12 +285,13 @@ def retrieve_sequence_edits(self):
                   lists of :class:`SequenceEdit`.
         """
         sequence_edits = defaultdict(list)
-
+        unreal_sg = sgtk.platform.current_engine().unreal_sg_engine
+        level_sequence_class = unreal.TopLevelAssetPath("/Script/LevelSequence", "LevelSequence")
         asset_helper = unreal.AssetRegistryHelpers.get_asset_registry()
         # Retrieve all Level Sequence assets
-        all_level_sequences = asset_helper.get_assets_by_class("LevelSequence")
+        all_level_sequences = asset_helper.get_assets_by_class(level_sequence_class)
         for lvseq_asset in all_level_sequences:
-            lvseq = unreal.load_asset(lvseq_asset.object_path, unreal.LevelSequence)
+            lvseq = unreal.load_asset(unreal_sg.object_path(lvseq_asset), unreal.LevelSequence)
             # Check shots
             for track in lvseq.find_master_tracks_by_type(unreal.MovieSceneCinematicShotTrack):
                 for section in track.get_sections():

python/tk_unreal/unreal_sg_engine.py

@@ -148,7 +148,7 @@ def _get_context_url(self, engine):
             # Asset must be loaded to read the metadata from item
             # Note that right-clicking on an asset in the Unreal Content Browser already loads item
             # But a load could be triggered if the context is from a selected actor
-            loaded_asset = unreal.EditorAssetLibrary.load_asset(selected_asset.object_path)
+            loaded_asset = unreal.EditorAssetLibrary.load_asset(self.object_path(selected_asset))
         elif selected_actor:
             # Get the asset that is associated with the selected actor
             assets = self.get_referenced_assets(selected_actor)
@@ -235,6 +235,20 @@ def shutdown(self):
             QtWidgets.QApplication.instance().quit()
             QtWidgets.QApplication.processEvents()
 
+    @staticmethod
+    def object_path(asset_data):
+        """
+        Return the object path for the given asset_data.
+
+        :param asset_data: A :class:`AssetData` instance.
+        :returns: A string.
+        """
+        # The attribute is not available anymore from
+        # UE 5.1
+        if hasattr(asset_data, "object_path"):
+            return asset_data.object_path
+        return "%s.%s" % (asset_data.package_name, asset_data.asset_name)
+
     """
     Menu generation functionality for Unreal (based on the 3ds max Menu Generation implementation)