diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-25 23:08:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-25 23:10:02 +0300 |
| commit | 82de58b3184daf939b39659bbe0cd53209a30b6e (patch) | |
| tree | 3e4b1add9f0cc08fa137741656eb9d51c6b5c81f /source/blender/blenkernel/intern/scene.c | |
| parent | e59a2fcc35ced809f61150bba2a00a7350eb04da (diff) | |
Fix T62927: Assert when opening default 2.79 startup file in 2.80.
Not sure why that was asserted on instead of handling the flag properly,
if base is not selectable, then just do not select it...
Have the feeling this code handling sync of flags between bases and
objects could use some cleanup, but that will be for another day.
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; |