diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 10:06:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 10:06:35 +0400 |
| commit | ac0a8af41413b730c0ab17cf19390c65dee3134c (patch) | |
| tree | 2dd171dae5a4d56b4eb68590808cb62ad8f1696d /source/blender/imbuf | |
| parent | 9c6deff652d498501d7065e77cdbacfb6478c370 (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |