Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-18 23:20:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-18 23:20:21 +0400
commit4759f70e33801a7d1ad36a991bbb8d7283ed52de (patch)
treed1c88d73b3841c205029d97f74a0bd031e5eaefe /source/blender/blenkernel/intern/image.c
parent602691fdfc5bdb88f52ca7b96b6d2dce0911abce (diff)
Fix crash editing mask with no image in the image editor.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f30c5b9ba34..5c1fbf66c43 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2998,5 +2998,8 @@ void BKE_image_get_aspect(Image *image, float *aspx, float *aspy)
*aspx = 1.0;
/* x is always 1 */
- *aspy = image->aspy / image->aspx;
+ if (image)
+ *aspy = image->aspy / image->aspx;
+ else
+ *aspy = 1.0f;
}