[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60212] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: fix [#36758] Add Group Instance crash

Campbell Barton ideasman42 at gmail.com
Wed Sep 18 02:28:23 CEST 2013


Revision: 60212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60212
Author:   campbellbarton
Date:     2013-09-18 00:28:23 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
fix [#36758] Add Group Instance crash

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-09-18 00:07:17 UTC (rev 60211)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2013-09-18 00:28:23 UTC (rev 60212)
@@ -4082,6 +4082,11 @@
 	float zfac;
 	bool flip;
 	
+	/* normally the caller should ensure this,
+	 * but this is called from areas that aren't already dealing with the viewport */
+	if (rv3d == NULL)
+		return;
+
 	zfac = ED_view3d_calc_zfac(rv3d, fp, &flip);
 	
 	/* reset the depth based on the view offset (we _know_ the offset is infront of us) */




More information about the Bf-blender-cvs mailing list