[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50731] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix crash editing mask with no image in the image editor.

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Sep 18 21:20:21 CEST 2012


Revision: 50731
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50731
Author:   blendix
Date:     2012-09-18 19:20:21 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Fix crash editing mask with no image in the image editor.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2012-09-18 15:58:07 UTC (rev 50730)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2012-09-18 19:20:21 UTC (rev 50731)
@@ -2998,5 +2998,8 @@
 	*aspx = 1.0;
 
 	/* x is always 1 */
-	*aspy = image->aspy / image->aspx;
+	if (image)
+		*aspy = image->aspy / image->aspx;
+	else
+		*aspy = 1.0f;
 }




More information about the Bf-blender-cvs mailing list