diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
| commit | d8e2ed8ae2257c9e301dd85127cab5d6cc2b6a58 (patch) | |
| tree | b8402f51476ad78d175411f2ef733816dd7a4fcd /source/blender/editors/space_image | |
| parent | 5323a2f18f0e004a2e2cf6d619a6f93456c47f03 (diff) | |
| parent | db5682ac8c53377e819fd50357de580c02405fca (diff) | |
svn merge ^/trunk/blender -r50999:51100soc-2012-bratwurst
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 0d40a6ae007..2f01483d23f 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -120,6 +120,8 @@ ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **lock_r) if (ibuf && (ibuf->rect || ibuf->rect_float)) return ibuf; } + else + *lock_r = NULL; return NULL; } |