Merge remote-tracking branch 'upstream/develop' into maya_select_containers

openpype/plugins/publish/help/validate_containers.xml

@@ -3,9 +3,9 @@
 <error id="main">
 <title>Not up-to-date assets</title>
 <description>
-## Obsolete containers found
+## Outdated containers found
 
-Scene contains one or more obsolete loaded containers, eg. items loaded into scene by Loader.
+Scene contains one or more outdated loaded containers, eg. versions loaded into scene by Loader are not latest.
 
 ### How to repair?
 
@@ -17,8 +17,7 @@ Use 'Scene Inventory' and update all highlighted old container to latest OR
 <detail>
 ### __Detailed Info__ (optional)
 
-This validator protects you from rendering obsolete content, someone modified some referenced asset in this scene, eg.
-    by skipping this you would ignore changes to that asset.
+This validates whether you're working with the latest versions of published content loaded into your scene. This protects you from using outdated versions of an asset.
 </detail>
 </error>
 </root>

openpype/plugins/publish/integrate_hero_version.py

@@ -313,13 +313,9 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
                 }
                 repre_context = template_filled.used_values
                 for key in self.db_representation_context_keys:
-                    if (
-                        key in repre_context or
-                        key not in anatomy_data
-                    ):
-                        continue
-
-                    repre_context[key] = anatomy_data[key]
+                    value = anatomy_data.get(key)
+                    if value is not None:
+                        repre_context[key] = value
 
                 # Prepare new repre
                 repre = copy.deepcopy(repre_info["representation"])

openpype/tools/sceneinventory/view.py

@@ -551,16 +551,16 @@ class SceneInventoryView(QtWidgets.QTreeView):
             "toggle": selection_model.Toggle,
         }[options.get("mode", "select")]
 
-        for item in iter_model_rows(model, 0):
-            item = item.data(InventoryModel.ItemRole)
+        for index in iter_model_rows(model, 0):
+            item = index.data(InventoryModel.ItemRole)
             if item.get("isGroupNode"):
                 continue
 
             name = item.get("objectName")
             if name in object_names:
-                self.scrollTo(item)  # Ensure item is visible
+                self.scrollTo(index)  # Ensure item is visible
                 flags = select_mode | selection_model.Rows
-                selection_model.select(item, flags)
+                selection_model.select(index, flags)
 
                 object_names.remove(name)