diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-10-22 10:42:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-29 13:10:14 +0300 |
commit | 4d581c01cce783fd5f2deed4a65db9128c174c2d (patch) | |
tree | 9d3910eddf137100cd63cca2c9a659662efdf093 /source/blender/editors/space_outliner/outliner_intern.h | |
parent | e1f5433f1dd72913f45ab3cbd0e887d4a6354e8c (diff) |
Fix T46561: Crash in outliner delete hierarchy
When children & parents were selected in the outliner,
it attempted to free the the object twice.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index c89a1bb1b9f..f10e6be2fa9 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -150,8 +150,15 @@ int outliner_item_do_activate(struct bContext *C, int x, int y, bool extend, boo /* outliner_edit.c ---------------------------------------------- */ -void outliner_do_object_operation(struct bContext *C, struct Scene *scene, struct SpaceOops *soops, struct ListBase *lb, - void (*operation_cb)(struct bContext *C, struct Scene *scene, struct TreeElement *, struct TreeStoreElem *, TreeStoreElem *)); +void outliner_do_object_operation_ex( + struct bContext *C, struct Scene *scene, struct SpaceOops *soops, struct ListBase *lb, + void (*operation_cb)(struct bContext *C, struct Scene *scene, + struct TreeElement *, struct TreeStoreElem *, TreeStoreElem *), + bool recurse_selected); +void outliner_do_object_operation( + struct bContext *C, struct Scene *scene, struct SpaceOops *soops, struct ListBase *lb, + void (*operation_cb)(struct bContext *C, struct Scene *scene, + struct TreeElement *, struct TreeStoreElem *, TreeStoreElem *)); int common_restrict_check(struct bContext *C, struct Object *ob); |