[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33290] trunk/blender/source/blender: fix for crash canceling fly mode.

[Campbell Barton]

Revision: 33290
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33290
Author:   campbellbarton
Date:     2010-11-24 17:54:18 +0100 (Wed, 24 Nov 2010)

Log Message:
-----------
fix for crash canceling fly mode.

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

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-11-24 16:34:38 UTC (rev 33289)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-11-24 16:54:18 UTC (rev 33290)
@@ -2169,6 +2169,7 @@
 	}
 }
 
+/* warning, this can allocate generated images */
 ImBuf *BKE_image_get_ibuf(Image *ima, ImageUser *iuser)
 {
 	return BKE_image_acquire_ibuf(ima, iuser, NULL);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c	2010-11-24 16:34:38 UTC (rev 33289)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c	2010-11-24 16:54:18 UTC (rev 33290)
@@ -894,7 +894,9 @@
 {
 	int exit_code;
 	short do_draw= FALSE;
-	FlyInfo *fly = op->customdata;
+	FlyInfo *fly= op->customdata;
+	RegionView3D *rv3d= fly->rv3d;
+	Object *fly_object= fly->root_parent ? fly->root_parent : fly->v3d->camera;
 
 	fly->redraw= 0;
 
@@ -909,10 +911,10 @@
 
 	if(exit_code!=OPERATOR_RUNNING_MODAL)
 		do_draw= TRUE;
-	
+
 	if(do_draw) {
-		if(fly->rv3d->persp==RV3D_CAMOB) {
-			WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, fly->root_parent ? fly->root_parent : fly->v3d->camera);
+		if(rv3d->persp==RV3D_CAMOB) {
+			WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, fly_object);
 		}
 
 		ED_region_tag_redraw(CTX_wm_region(C));