diff options
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 962555c13f4..50216d2e69a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1735,9 +1735,8 @@ void BKE_scene_object_base_flag_sync_from_object(Base *base) Object *ob = base->object; base->flag = ob->flag; - if ((ob->flag & SELECT) != 0) { + if ((ob->flag & SELECT) != 0 && (base->flag & BASE_SELECTABLE) != 0) { base->flag |= BASE_SELECTED; - BLI_assert((base->flag & BASE_SELECTABLE) != 0); } else { base->flag &= ~BASE_SELECTED; |