[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31779] trunk/blender/source/blender/ editors/space_outliner/outliner.c: bugfix [#23695] SigSegV when deleting camera from multiple scenes via outline pop-up menu

Campbell Barton ideasman42 at gmail.com
Mon Sep 6 08:48:19 CEST 2010


Revision: 31779
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31779
Author:   campbellbarton
Date:     2010-09-06 08:48:19 +0200 (Mon, 06 Sep 2010)

Log Message:
-----------
bugfix [#23695] SigSegV when deleting camera from multiple scenes via outline pop-up menu

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-09-06 06:04:05 UTC (rev 31778)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-09-06 06:48:19 UTC (rev 31779)
@@ -3235,8 +3235,8 @@
 				if(sce && scene != sce) {
 					ED_screen_set_scene(C, sce);
 				}
-				
-				operation_cb(C, scene, te, NULL, tselem);
+				/* important to use 'sce' not scene else deleting objects can crash */
+				operation_cb(C, sce, te, NULL, tselem);
 			}
 		}
 		if((tselem->flag & TSE_CLOSED)==0) {





More information about the Bf-blender-cvs mailing list