[Bf-blender-cvs] [6d0a6e380e5] master: Fix failing assert on factory settings load
Julian Eisel
noreply at git.blender.org
Fri May 24 19:59:33 CEST 2019
Commit: 6d0a6e380e571c9986635d71191ff05f68a53035
Author: Julian Eisel
Date: Fri May 24 19:49:44 2019 +0200
Branches: master
https://developer.blender.org/rB6d0a6e380e571c9986635d71191ff05f68a53035
Fix failing assert on factory settings load
Loading factory preferences from the preferences window and triggering a
redraw then would cause the failing assert.
We shouldn't mess with window-manager data when loading preferences
only.
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 097db49aea6..d93d4a618d7 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -978,7 +978,7 @@ void wm_homefile_read(bContext *C,
}
}
}
- if (BLI_listbase_is_empty(&wmbase)) {
+ if (use_data && BLI_listbase_is_empty(&wmbase)) {
wm_clear_default_size(C);
}
}
More information about the Bf-blender-cvs
mailing list