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:
authorPhilipp Oeser <info@graphics-engineer.com>2019-10-17 19:54:14 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-10-18 14:29:54 +0300
commit725b59d9b44a632095c90e1912f14431b0171f1d (patch)
tree571f42e122ecfe482c6ecdef54460bc9c2600e60 /source/blender/windowmanager
parent8378db40c71af53e3a48ef797cdacb38a1a26edc (diff)
Fix T70903: Opening splash screen from named app_template crashes
Caused by rB46102cf4e0c4 [which removed the check if the image can actually be loaded]. Maniphest Tasks: T70903 Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D6089
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_splash_screen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c
index 662238b4ae1..3603ce81654 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@ -209,7 +209,7 @@ static ImBuf *wm_block_splash_image(int r_unit_size[2])
ibuf = IMB_loadiffname(splash_filepath, IB_rect, NULL);
/* We could skip this check, see comment about 'x_expect' above. */
- if (ibuf->x != x_expect) {
+ if (ibuf && ibuf->x != x_expect) {
CLOG_ERROR(WM_LOG_OPERATORS,
"Splash expected %d width found %d, ignoring: %s\n",
x_expect,