[Bf-blender-cvs] [0bf0aa6] master: Fix: Don't show "Clear Keyframes" option in RMB menu for NLA Strip properties

Joshua Leung noreply at git.blender.org
Sat Jun 13 15:23:47 CEST 2015


Commit: 0bf0aa6625cdf5ed2ab57e11cfa52ac60e95c965
Author: Joshua Leung
Date:   Sun Jun 14 01:21:02 2015 +1200
Branches: master
https://developer.blender.org/rB0bf0aa6625cdf5ed2ab57e11cfa52ac60e95c965

Fix: Don't show "Clear Keyframes" option in RMB menu for NLA Strip properties

Since these FCurves for these properties cannot be deleted, this operator is useless
in this case.

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 59a06b3..c911e6c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6532,7 +6532,7 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 			}
 		}
 		
-		if (but->flag & UI_BUT_ANIMATED) {
+		if ((but->flag & UI_BUT_ANIMATED) && (but->rnapoin.type != &RNA_NlaStrip)) {
 			if (is_array_component) {
 				uiItemBooleanO(layout, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Clear Keyframes"),
 				               ICON_NONE, "ANIM_OT_keyframe_clear_button", "all", 1);




More information about the Bf-blender-cvs mailing list