diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-30 14:39:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-30 14:39:00 +0400 |
| commit | 9f67ebc35117313bb48f779a727f239eabf22293 (patch) | |
| tree | cb14338ae6e01afc73e6d7a4ea34023e68b4f8b7 | |
| parent | 368e502dba0a635b10a0ee2ea1641666a91283ff (diff) | |
fix for crash drawing the clip view with a blend file that has lock to selected, but no clip in the view.
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 32f91671daf..167353e7cb7 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -368,7 +368,7 @@ int ED_clip_view_selection(const bContext *C, ARegion *ar, int fit) ED_space_clip_get_size(sc, &frame_width, &frame_height); - if (frame_width == 0 || frame_height == 0) + if ((frame_width == 0) || (frame_height == 0) || (sc->clip == NULL)) return FALSE; if (!selected_boundbox(sc, min, max)) diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index e617daf6cf7..4f57b2249d1 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1432,7 +1432,7 @@ static int image_save_as_poll(bContext *C) SpaceImage *sima = CTX_wm_space_image(C); Image *ima = ED_space_image(sima); - if ((ima->source == IMA_SRC_VIEWER)) { + if (ima->source == IMA_SRC_VIEWER) { CTX_wm_operator_poll_msg_set(C, "can't save image while rendering"); return FALSE; } |