From a08721b5b4953370b934ecd845c49f9823a1d65a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 3 Feb 2021 17:31:25 +0100 Subject: [PATCH] child_has_project_override never returns true if override state is not PROJECT --- pype/settings/entities/base_entity.py | 7 ++++--- pype/settings/entities/item_entities.py | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pype/settings/entities/base_entity.py b/pype/settings/entities/base_entity.py index 85109472f7..61cae6cdc7 100644 --- a/pype/settings/entities/base_entity.py +++ b/pype/settings/entities/base_entity.py @@ -546,9 +546,10 @@ class RootEntity(BaseEntity): @property def child_has_project_override(self): - for child_obj in self.non_gui_children.values(): - if child_obj.child_has_project_override: - return True + if self.override_state is OverrideState.PROJECT: + for child_obj in self.non_gui_children.values(): + if child_obj.child_has_project_override: + return True return False @property diff --git a/pype/settings/entities/item_entities.py b/pype/settings/entities/item_entities.py index 17cae79227..e86d70fba2 100644 --- a/pype/settings/entities/item_entities.py +++ b/pype/settings/entities/item_entities.py @@ -459,9 +459,10 @@ class DictImmutableKeysEntity(ItemEntity): @property def child_has_project_override(self): - for child_obj in self.non_gui_children.values(): - if child_obj.child_has_studio_override: - return True + if self.override_state is OverrideState.PROJECT: + for child_obj in self.non_gui_children.values(): + if child_obj.child_has_studio_override: + return True return False def settings_value(self): @@ -876,7 +877,10 @@ class DictMutableKeysEntity(ItemEntity): @property def child_has_project_override(self): - pass + if self.override_state is OverrideState.PROJECT: + # TODO implement + pass + return False def discard_changes(self): pass @@ -1114,7 +1118,10 @@ class ListEntity(ItemEntity): @property def child_has_project_override(self): - pass + if self.override_state is OverrideState.PROJECT: + # TODO implement + pass + return False def discard_changes(self): pass