[Bf-blender-cvs] [844c7440fcb] blender2.8: Fix (unreported) `bpy.ops.wm.read_factory_settings(use_empty=True)` crash.

Bastien Montagne noreply at git.blender.org
Wed Nov 14 18:21:21 CET 2018


Commit: 844c7440fcbf2aa30d73418f43e6cb42cf27a6ee
Author: Bastien Montagne
Date:   Wed Nov 14 18:04:01 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB844c7440fcbf2aa30d73418f43e6cb42cf27a6ee

Fix (unreported) `bpy.ops.wm.read_factory_settings(use_empty=True)` crash.

`BKE_blendfile_read_make_empty()` was not preserving workspaces...

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

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

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

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 5f716d191e4..5a975402c90 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -468,7 +468,7 @@ void BKE_blendfile_read_make_empty(bContext *C)
 	while (a--) {
 		id = lbarray[a]->first;
 		if (id != NULL) {
-			if (ELEM(GS(id->name), ID_SCE, ID_SCR, ID_WM)) {
+			if (ELEM(GS(id->name), ID_SCE, ID_SCR, ID_WM, ID_WS)) {
 				continue;
 			}
 			while ((id = lbarray[a]->first)) {



More information about the Bf-blender-cvs mailing list