diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
| commit | eb9d591898e93dbbe9e28865018175b9da730596 (patch) | |
| tree | 3209caefe505273e834a936e54f6146a4185e83b /source/blender/editors/space_outliner/outliner_tree.c | |
| parent | 6d7490632f13f9744c6b3e507c838a34f3481846 (diff) | |
| parent | f1fb54e126824ff38b8bf26fa80f3f46c886bd45 (diff) | |
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 0c6ef67d603..24b7085e2f4 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -719,7 +719,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor { Speaker *spk= (Speaker *)id; - outliner_add_element(soops, &te->subtree, spk->adt, te, TSE_ANIM_DATA, 0); + if(spk->adt) + outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0); } break; case ID_WO: |