diff options
Diffstat (limited to 'source/blender/editors/space_nla/nla_channels.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index a0c6a29c422..3c0238806bf 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -20,6 +20,7 @@ #include "BKE_anim_data.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_nla.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -129,7 +130,8 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, int channel_index, else { /* deselect all */ /* TODO: should this deselect all other types of channels too? */ - LISTBASE_FOREACH (Base *, b, &view_layer->object_bases) { + BKE_view_layer_synced_ensure(ac->scene, view_layer); + LISTBASE_FOREACH (Base *, b, BKE_view_layer_object_bases_get(view_layer)) { ED_object_base_select(b, BA_DESELECT); if (b->object->adt) { b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE); @@ -478,7 +480,7 @@ void NLA_OT_action_pushdown(wmOperatorType *ot) "Index of NLA action channel to perform pushdown operation on", 0, INT_MAX); - RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE | PROP_HIDDEN); } /* ******************** Action Unlink ******************************** */ |