[Bf-blender-cvs] [f96b729d7b5] master: FIX T101275: Regression in NLA causes Actions to be ignored by Context menu (I.e influence, etc)

[Nate Rupsis]

Commit: f96b729d7b5a6406fab07108b1cbbbd07b635d51
Author: Nate Rupsis
Date:   Wed Sep 28 15:06:55 2022 -0600
Branches: master
https://developer.blender.org/rBf96b729d7b5a6406fab07108b1cbbbd07b635d51

FIX T101275: Regression in NLA causes Actions to be ignored by Context menu (I.e influence, etc)

Reviewed By: sybren

Differential Revision: http://developer.blender.org/D16154

===================================================================

M	source/blender/editors/space_nla/nla_buttons.c
M	source/tools

===================================================================

diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index a46da391bdc..4aff3766b12 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -107,7 +107,6 @@ bool nla_panel_context(const bContext *C,
         found = 1;
         break;
       }
-      case ANIMTYPE_NLAACTION:
       case ANIMTYPE_SCENE: /* Top-Level Widgets doubling up as datablocks */
       case ANIMTYPE_OBJECT:
       case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
@@ -158,6 +157,11 @@ bool nla_panel_context(const bContext *C,
         }
         break;
       }
+      /* Don't set a pointer for NLA Actions.
+       * This will break the dependency graph for the context menu.
+       */
+      case ANIMTYPE_NLAACTION:
+        break;
     }
 
     if (found > 0) {
diff --git a/source/tools b/source/tools
index 2ab59df2c98..2a541f164a2 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2ab59df2c987d383a7ed9dbcd4f3897bbba7c12b
+Subproject commit 2a541f164a222ef7bcd036d37687738acee8d946