diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-07 06:42:26 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-07 06:42:26 +0400 |
| commit | a8acb22f6a969a3db3dd1e4049c84dd8baf99379 (patch) | |
| tree | 5614eac84f6e343103d656621a9a4e44fb5dbddb /source/blender/editors/space_outliner | |
| parent | 665506ced836f775e87868386c1b8acecd198725 (diff) | |
Fixed bug #22518, Segfault on loading file
* Problem was a pointer not being updated after the tree was changed
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 21da637fd7c..37e05cbc682 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -439,8 +439,8 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i 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 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc 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; |