[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29293] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Fixed bug #22518, Segfault on loading file

Nicholas Bishop nicholasbishop at gmail.com
Mon Jun 7 04:42:28 CEST 2010


Revision: 29293
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29293
Author:   nicholasbishop
Date:     2010-06-07 04:42:26 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
Fixed bug #22518, Segfault on loading file
* Problem was a pointer not being updated after the tree was changed

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-06-07 02:12:54 UTC (rev 29292)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-06-07 02:42:26 UTC (rev 29293)
@@ -439,8 +439,8 @@
 
 static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl)
 {
-	TreeStoreElem *tselem= TREESTORE(tenla);
-	TreeElement *te;
+	TreeStoreElem *tselem = NULL;
+	TreeElement *te = NULL;
 
 	/* log stuff is to convert bitflags (powers of 2) to small integers,
 	 * in order to not overflow short tselem->nr */
@@ -450,6 +450,7 @@
 	te->directdata= &srl->passflag;
 	
 	/* save cpu cycles, but we add the first to invoke an open/close triangle */
+	tselem = TREESTORE(tenla);
 	if(tselem->flag & TSE_CLOSED)
 		return;
 	





More information about the Bf-blender-cvs mailing list