Fix T54767: Crash in versionning code for recent editors' removal.
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:
parent
f19e8eaa4b
commit
dc16f6fedc
Notes:
blender-bot
2023-02-14 05:58:25 +01:00
Referenced by issue #54767, Crash starting Blender in Windows after timeline removal
|
@ -654,9 +654,9 @@ void do_versions_after_linking_280(Main *main)
|
|||
/* SpaceTime & SpaceLogic removal/replacing */
|
||||
if (!MAIN_VERSION_ATLEAST(main, 280, 9)) {
|
||||
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
|
||||
* screens using the active scene of the window they're displayed in.
|
||||
* 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 (ScrArea *area = screen->areabase.first; area; area = area->next) {
|
||||
if (ELEM(area->butspacetype, SPACE_TIME, SPACE_LOGIC)) {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit f35d8e55afffb9da50cc13b14615ed280f9e558c
|
||||
Subproject commit 56f3887596b538a9fc17e0439883f2e2305f2633
|
Loading…
Reference in New Issue