diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-11-16 10:24:38 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-11-16 10:24:38 +0300 |
| commit | 2625dc53487971d3def110ca70b88c178f772712 (patch) | |
| tree | 72ee09d909a07ab575169553a6aab88b0f9b6a8f /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 65d771dcafea2baa8a41389ecf15b069dfe3f392 (diff) | |
Bugfix T41525: Button keyframe indicators don't work correctly when editing NLA Strips
When the active action is a NLA strip, the keyframe indicator colors for buttons
and the 3D view indicator (i.e. the current frame indicator changes color) didn't
work correctly. This was because they were still checking for keyframes in
"global" time space, whereas they needed to be applying NLA corrections to
"look inside" the remapped action.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 377bd3ab431..3df6bd51f37 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -197,7 +197,7 @@ static void restrictbutton_recursive_child(bContext *C, Scene *scene, Object *ob RNA_id_pointer_create(&ob->id, &ptr); prop = RNA_struct_find_property(&ptr, rnapropname); - fcu = rna_get_fcurve_context_ui(C, &ptr, prop, 0, &action, &driven); + fcu = rna_get_fcurve_context_ui(C, &ptr, prop, 0, NULL, &action, &driven); if (fcu && !driven) { id = ptr.id.data; |