diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-12-06 02:24:43 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-12-06 02:24:43 +0300 |
| commit | 947b99b0ced6f54817202b6c4bb27bc660b9fa53 (patch) | |
| tree | 4585c10c4a59e6a9cb0ba547092455051ee2897c /source/blender/src/outliner.c | |
| parent | 1e811c7886bef99ff81f6990f4337f526c3676bd (diff) | |
Outliner crash reported bu K-rich;
- with outliner visible
- alt+d (linked dupli) an armature
Diffstat (limited to 'source/blender/src/outliner.c')
| -rw-r--r-- | source/blender/src/outliner.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 5181d253d6e..a10ac115e07 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -178,7 +178,7 @@ static void check_persistant(SpaceOops *soops, TreeElement *te, ID *id, short ty tselem= ts->data; for(a=0; a<ts->usedelem; a++, tselem++) { if(tselem->id==id && tselem->used==0) { - if(type==0 ||(tselem->type==type && tselem->nr==nr)) { + if((type==0 && tselem->type==0) ||(tselem->type==type && tselem->nr==nr)) { te->store_index= a; tselem->used= 1; return; @@ -582,6 +582,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i if(G.obedit && G.obedit->data==arm) { EditBone *ebone; TreeElement *ten; + for (ebone = G.edbo.first; ebone; ebone=ebone->next, a++) { ten= outliner_add_element(soops, &te->subtree, id, te, TSE_EBONE, a); ten->directdata= ebone; @@ -624,6 +625,7 @@ static void outliner_add_bone(SpaceOops *soops, ListBase *lb, ID *id, Bone *curB (*a)++; te->name= curBone->name; te->directdata= curBone; + for(curBone= curBone->childbase.first; curBone; curBone=curBone->next) { outliner_add_bone(soops, &te->subtree, id, curBone, te, a); } |