Commit: 8faaeef5fb03af2d6737e3816506fcde40c161b9
Author: Brecht Van Lommel
Date: Mon Jul 15 22:20:51 2019 +0200
Branches: master
https://developer.blender.org/rB8faaeef5fb03af2d6737e3816506fcde40c161b9
Fix T67016: crash drawing image editor without image
===================================================================
M source/blender/editors/space_image/image_draw.c
===================================================================
diff --git a/source/blender/editors/space_image/image_draw.c
b/source/blender/editors/space_image/image_draw.c
index 38253890624..97a3c7f2480 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -798,7 +798,9 @@ void draw_image_main(const bContext *C, ARegion *ar)
ED_space_image_get_zoom(sima, ar, &zoomx, &zoomy);
/* Tag image as in active use for garbage collector. */
- BKE_image_tag_time(ima);
+ if (ima) {
+ BKE_image_tag_time(ima);
+ }
show_viewer = (ima && ima->source == IMA_SRC_VIEWER) != 0;
show_render = (show_viewer && ima->type == IMA_TYPE_R_RESULT) != 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
