diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-13 16:48:48 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-13 16:48:48 +0300 |
| commit | 1cb6cea71c10c0d22ba9cdd3eee5111d0734c193 (patch) | |
| tree | 1cbd74c668006be134692e883ceef7286db3a368 /source/blender/editors/space_image | |
| parent | f30a2a786214c4ef08612486c227add0bb6bf35b (diff) | |
| parent | 8a03e4d409ec71beab612facf432eb57f3bc5f34 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ccbc8330810..906bbf74a96 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1305,7 +1305,7 @@ 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; |