From c4d8bb6d308678bf1f78a232375febec0ddb71dc Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 3 May 2021 20:00:02 +0200
Subject: [PATCH] overriden metadata order doesn't matter

---
 openpype/settings/entities/dict_immutable_keys_entity.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openpype/settings/entities/dict_immutable_keys_entity.py b/openpype/settings/entities/dict_immutable_keys_entity.py
index d5563f80d6..cdb3b9aebe 100644
--- a/openpype/settings/entities/dict_immutable_keys_entity.py
+++ b/openpype/settings/entities/dict_immutable_keys_entity.py
@@ -353,6 +353,15 @@ class DictImmutableKeysEntity(ItemEntity):
         for key in METADATA_KEYS:
             if key in value:
                 metadata[key] = value.pop(key)
+
+        old_metadata = metadata.get(M_OVERRIDEN_KEY)
+        if old_metadata:
+            new_metadata = []
+            for key in self.non_gui_children.keys():
+                if key in old_metadata:
+                    new_metadata.append(key)
+            metadata[M_OVERRIDEN_KEY] = new_metadata
+
         return value, metadata
 
     def update_default_value(self, value):