Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T54767: Crash in versionning code for recent editors' removal.

Browse Source 
Always check for non-Null pointers there! This versionning code is
called from many different places, with many different kind of Main's.
This commit is contained in:
Bastien Montagne
2018-04-23 12:27:09 +02:00
parent f19e8eaa4b
commit dc16f6fedc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenloader/intern/versioning_280.c
View File

@@ -654,9 +654,9 @@ void do_versions_after_linking_280(Main *main)
/* SpaceTime & SpaceLogic removal/replacing */ /* SpaceTime & SpaceLogic removal/replacing */
if (!MAIN_VERSION_ATLEAST(main, 280, 9)) { if (!MAIN_VERSION_ATLEAST(main, 280, 9)) {
const wmWindowManager *wm = main->wm.first; const wmWindowManager *wm = main->wm.first;
if (wm != NULL) { const Scene *scene = main->scene.first;
const Scene *scene = main->scene.first;
if (wm != NULL) {
/* Action editors need a scene for creation. First, update active /* Action editors need a scene for creation. First, update active
* screens using the active scene of the window they're displayed in. * screens using the active scene of the window they're displayed in.
* Next, update remaining screens using first scene in main listbase. */ * Next, update remaining screens using first scene in main listbase. */
@@ -672,7 +672,8 @@ void do_versions_after_linking_280(Main *main)
} }
} }
} }
}
if (scene != NULL) {
for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) { for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) {
if (ELEM(area->butspacetype, SPACE_TIME, SPACE_LOGIC)) { if (ELEM(area->butspacetype, SPACE_TIME, SPACE_LOGIC)) {

2
source/tools

Submodule source/tools updated: f35d8e55af...56f3887596