diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-21 04:43:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-21 04:43:17 +0300 |
| commit | b66728d63deee0fc9ef517405466d1139871251d (patch) | |
| tree | 03b92d528c53e48434d4e6361ecfc1b7607d2f56 /source/blender/editors/animation/keyframing.c | |
| parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
| parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation/keyframing.c')
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 66872c77b04..93ce45e1e8f 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1791,6 +1791,10 @@ static int insert_key_button_exec(bContext *C, wmOperator *op) if (fcu) { success = insert_keyframe_direct(op->reports, ptr, prop, fcu, cfra, ts->keyframe_type, 0); } + else { + BKE_report(op->reports, RPT_ERROR, + "This property cannot be animated as it will not get updated correctly"); + } } else if (UI_but_flag_is_set(but, UI_BUT_DRIVEN)) { /* Driven property - Find driver */ @@ -1886,7 +1890,7 @@ static int delete_key_button_exec(bContext *C, wmOperator *op) } if (ptr.id.data && ptr.data && prop) { - if (ptr.type == &RNA_NlaStrip) { + if (BKE_nlastrip_has_curves_for_property(&ptr, prop)) { /* Handle special properties for NLA Strips, whose F-Curves are stored on the * strips themselves. These are stored separately or else the properties will * not have any effect. |