[Bf-blender-cvs] [7388856318f] master: Cleanup: Object base syncing already happening as part of ED_object_base_select
Dalai Felinto
noreply at git.blender.org
Tue Apr 30 21:57:16 CEST 2019
Commit: 7388856318f136d967c4dc04d647307247285b4a
Author: Dalai Felinto
Date: Tue Apr 23 16:27:49 2019 -0300
Branches: master
https://developer.blender.org/rB7388856318f136d967c4dc04d647307247285b4a
Cleanup: Object base syncing already happening as part of ED_object_base_select
No functional change.
===================================================================
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/space_nla/nla_channels.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 3107eb927e4..3d7684dcc6b 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2860,7 +2860,6 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
if (selectmode == SELECT_INVERT) {
/* swap select */
ED_object_base_select(base, BA_INVERT);
- BKE_scene_object_base_flag_sync_from_base(base);
if (adt) {
adt->flag ^= ADT_UI_SELECTED;
@@ -2873,7 +2872,6 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
/* TODO: should this deselect all other types of channels too? */
for (b = view_layer->object_bases.first; b; b = b->next) {
ED_object_base_select(b, BA_DESELECT);
- BKE_scene_object_base_flag_sync_from_base(b);
if (b->object->adt) {
b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE);
}
@@ -2881,7 +2879,6 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
/* select object now */
ED_object_base_select(base, BA_SELECT);
- BKE_scene_object_base_flag_sync_from_base(base);
if (adt) {
adt->flag |= ADT_UI_SELECTED;
}
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index 638ad62592e..4115d6b49ba 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -136,7 +136,6 @@ static int mouse_nla_channels(
if (selectmode == SELECT_INVERT) {
/* swap select */
ED_object_base_select(base, BA_INVERT);
- BKE_scene_object_base_flag_sync_from_base(base);
if (adt) {
adt->flag ^= ADT_UI_SELECTED;
@@ -147,7 +146,6 @@ static int mouse_nla_channels(
/* TODO: should this deselect all other types of channels too? */
for (Base *b = view_layer->object_bases.first; b; b = b->next) {
ED_object_base_select(b, BA_DESELECT);
- BKE_scene_object_base_flag_sync_from_base(b);
if (b->object->adt) {
b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE);
}
@@ -155,7 +153,6 @@ static int mouse_nla_channels(
/* select object now */
ED_object_base_select(base, BA_SELECT);
- BKE_scene_object_base_flag_sync_from_base(base);
if (adt) {
adt->flag |= ADT_UI_SELECTED;
}
More information about the Bf-blender-cvs
mailing list