- Silencing some gcc warnings (yay! I can finally use this setup

again)
- Graph Editor "Active Keyframe" panel now displays more descriptive
error messages. In particular, hopefully this helps to alert users of
the default generator modifier for Driver F-Curves
- The first F-Modifier added to a list is now set to be active one for
that list.

1 files changed, 13 insertions, 2 deletions

diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index 21c269633f6..d34ef74b66a 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -278,8 +278,19 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa)
 			if (bezt->ipo == BEZT_IPO_BEZ)
 				uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, ICON_NULL);
 	}
-	else
-		uiItemL(layout, "No active keyframe on F-Curve", ICON_NULL);
+	else {
+		if ((fcu->bezt == NULL) && (fcu->modifiers.first)) {
+			/* modifiers only - so no keyframes to be active */
+			uiItemL(layout, "F-Curve only has F-Modifiers", ICON_NULL);
+			uiItemL(layout, "See Modifiers panel below", ICON_INFO);
+		}
+		else if (fcu->fpt) {
+			/* samples only */
+			uiItemL(layout, "F-Curve doesn't have any keyframes as it only contains sampled points", ICON_NULL);
+		}
+		else
+			uiItemL(layout, "No active keyframe on F-Curve", ICON_NULL);
+	}
 	
 	MEM_freeN(ale);
 }