From ac0a8af41413b730c0ab17cf19390c65dee3134c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 27 May 2013 06:06:35 +0000 Subject: fix [#35518] UV Mapping crashes the Blender with specific image file 2 bugs here - missing NULL check in IMB_colormanagement_display_settings_from_ctx() - deadlock in draw_image_paint_helpers() Simple solution is to not draw paint helpers for render/viewer images. --- source/blender/imbuf/intern/colormanagement.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 78eb5eeb65b..235c6a0f37e 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -672,7 +672,7 @@ void IMB_colormanagement_display_settings_from_ctx(const bContext *C, *view_settings_r = &scene->view_settings; *display_settings_r = &scene->display_settings; - if (sima) { + if (sima && sima->image) { if ((sima->image->flag & IMA_VIEW_AS_RENDER) == 0) *view_settings_r = NULL; } -- cgit v1.2.3