[Bf-blender-cvs] [82de58b3184] master: Fix T62927: Assert when opening default 2.79 startup file in 2.80.

Bastien Montagne noreply at git.blender.org
Mon Mar 25 21:10:14 CET 2019


Commit: 82de58b3184daf939b39659bbe0cd53209a30b6e
Author: Bastien Montagne
Date:   Mon Mar 25 21:08:27 2019 +0100
Branches: master
https://developer.blender.org/rB82de58b3184daf939b39659bbe0cd53209a30b6e

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.

===================================================================

M	source/blender/blenkernel/intern/scene.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list