diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 19:37:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 19:37:43 +0400 |
| commit | e9d6b4db964ce98f04ecb23dbfbe8a11ee64d27b (patch) | |
| tree | 1381c40b0c466c5a35da521ba5ae2712d96e0b0c /source/blender/editors/space_outliner/outliner_tools.c | |
| parent | d02b6707f9431341db0cdfd986ef9a759154816f (diff) | |
fix for own recent commit removing NULL checks from TREESTORE macro - this use needed it.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index a3ed2eac2d5..cf236c66e53 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -226,7 +226,7 @@ static void outliner_do_libdata_operation(bContext *C, Scene *scene, SpaceOops * tselem = TREESTORE(te); if (tselem->flag & TSE_SELECTED) { if (tselem->type == 0) { - TreeStoreElem *tsep = TREESTORE(te->parent); + TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL; operation_cb(C, scene, te, tsep, tselem); } } @@ -866,7 +866,7 @@ static void outliner_do_id_set_operation(SpaceOops *soops, int type, ListBase *l tselem = TREESTORE(te); if (tselem->flag & TSE_SELECTED) { if (tselem->type == type) { - TreeStoreElem *tsep = TREESTORE(te->parent); + TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL; operation_cb(te, tselem, tsep, newid); } } |