[Bf-blender-cvs] [cd693955ad7] blender2.8: Set active base to NULL if its object is gone

Sergey Sharybin noreply at git.blender.org
Mon Sep 3 13:44:42 CEST 2018


Commit: cd693955ad73a5aaf064199d956f5eb9c708577e
Author: Sergey Sharybin
Date:   Mon Sep 3 13:42:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcd693955ad73a5aaf064199d956f5eb9c708577e

Set active base to NULL if its object is gone

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e6a4d872986..48c3ab47b1d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5771,6 +5771,9 @@ static void lib_link_view_layer(FileData *fd, Library *lib, ViewLayer *view_laye
 		if (base->object == NULL) {
 			/* Free in case linked object got lost. */
 			BLI_freelinkN(&view_layer->object_bases, base);
+			if (view_layer->basact == base) {
+				view_layer->basact = NULL;
+			}
 		}
 	}



More information about the Bf-blender-cvs mailing list