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

Nate Rupsis noreply at git.blender.org
Wed Oct 26 10:55:06 CEST 2022


Commit: bfc9d7cadfe834c477b1d7423304da3d962c9df3
Author: Nate Rupsis
Date:   Wed Sep 28 15:06:55 2022 -0600
Branches: blender-v3.3-release
https://developer.blender.org/rBbfc9d7cadfe834c477b1d7423304da3d962c9df3

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

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

diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 9652819404e..ff59fea1180 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) {



More information about the Bf-blender-cvs mailing list