diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-02 17:22:19 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-02 17:22:19 +0300 |
commit | 3a0df7d37bcf55b2b0f9a070d5c80f908e46ebc4 (patch) | |
tree | 01e256d9f853dbed48217c0ce95b8cc2946a3031 /source/blender/editors/space_spreadsheet | |
parent | 47396ea81edba585cc69c5760703cde727bc08a6 (diff) | |
parent | 6883c47bb5930be5a95d1c2e8e06fce2d3b68681 (diff) |
Merge remote-tracking branch 'origin/blender-v3.1-release'
Diffstat (limited to 'source/blender/editors/space_spreadsheet')
-rw-r--r-- | source/blender/editors/space_spreadsheet/spreadsheet_context.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_context.cc b/source/blender/editors/space_spreadsheet/spreadsheet_context.cc index 1a61f021e92..ec9fa72edb1 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_context.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_context.cc @@ -451,9 +451,7 @@ bool ED_spreadsheet_context_path_is_active(const bContext *C, SpaceSpreadsheet * if (modifier == nullptr) { return false; } - if (!(modifier->flag & eModifierFlag_Active)) { - return false; - } + const bool modifier_is_active = modifier->flag & eModifierFlag_Active; if (modifier->type != eModifierType_Nodes) { return false; } @@ -480,6 +478,12 @@ bool ED_spreadsheet_context_path_is_active(const bContext *C, SpaceSpreadsheet * if (snode->nodetree != root_node_tree) { continue; } + if (!modifier_is_active) { + if (!(snode->flag & SNODE_PIN)) { + /* Node tree has to be pinned when the modifier is not active. */ + continue; + } + } if (snode->id != &object->id) { continue; } |