diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-12 08:05:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-12 08:05:28 +0300 |
| commit | 5b3c15e3363aa7bea5d26c56191b7e8e74021868 (patch) | |
| tree | 43593db12883523a47ecc76abc736d1d56e99e11 /source/blender/editors/space_image/image_ops.c | |
| parent | aae8e211006a1d9099397727b48201b865504750 (diff) | |
Fix T53294: bpy.ops.image.open crash
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index f7df29ed2b6..24db8ba40fd 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1301,12 +1301,12 @@ static int image_open_exec(bContext *C, wmOperator *op) if (iod->iuser) { iuser = iod->iuser; } - else if (sa->spacetype == SPACE_IMAGE) { + else if (sa && sa->spacetype == SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; ED_space_image_set(sima, scene, obedit, ima); iuser = &sima->iuser; } - else if (sa->spacetype == SPACE_VIEW3D) { + else if (sa && sa->spacetype == SPACE_VIEW3D) { View3D *v3d = sa->spacedata.first; for (BGpic *bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) { |