[Bf-blender-cvs] [725b59d9b44] blender-v2.81-release: Fix T70903: Opening splash screen from named app_template crashes
Philipp Oeser
noreply at git.blender.org
Fri Oct 18 13:38:50 CEST 2019
Commit: 725b59d9b44a632095c90e1912f14431b0171f1d
Author: Philipp Oeser
Date: Thu Oct 17 18:54:14 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rB725b59d9b44a632095c90e1912f14431b0171f1d
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
===================================================================
M source/blender/windowmanager/intern/wm_splash_screen.c
===================================================================
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,
More information about the Bf-blender-cvs
mailing list