Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-02-11 13:16:32 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-02-11 13:16:32 +0300
commit8668006519e39c0fcaf2e3f2b5e508eb8478e2e4 (patch)
treed984515f30c263c1289710b555e02253cf063cdc
parentd4934f8f6d8d2da457adb6dd32047eb1627459a0 (diff)
Fix crasher in own UIList bookmarks commit.
Immediate crash in merged asset-experiments branch, no idea why it did not show in master too?
-rw-r--r--source/blender/editors/space_file/space_file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 6612d5ee937..3c60233d0a9 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -260,7 +260,8 @@ static void file_refresh(const bContext *C, ScrArea *sa)
sfile->layout->dirty = true;
}
- if (BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) {
+ /* Might be called with NULL sa, see file_main_area_draw() below. */
+ if (sa && BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) {
/* Create TOOLS/TOOL_PROPS regions. */
file_tools_region(sa);