Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2018-01-11 00:45:44 +0300
committerJulian Eisel <eiseljulian@gmail.com>2018-01-11 00:45:44 +0300
commit748e95ad50f260dd67aa83927dd90b389a1f3c59 (patch)
tree0328e4cfc703fa5c4630539e4818e25e7f5aac58 /source/blender/editors/space_outliner/outliner_intern.h
parent181124ad1352b19d82e178f302dd4b5c178e54ce (diff)
Fix crash when deleting collections
With factory settings, steps to reproduce were: * Select "Collection 1" (in "RenderLayer") * Delete It might crash at this point, although maybe this crash is ASAN only. However, this was also doing some weird things that I've corrected now. It called outliner_build_tree in an operator callback. This should only be called in the main redraw function or so, not in regular handlers. Instead, we manually cleanup the tree to keep it valid.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
-rw-r--r--source/blender/editors/space_outliner/outliner_intern.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index f2457b30a15..66f6c7026e6 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -178,8 +178,9 @@ typedef enum {
/* outliner_tree.c ----------------------------------------------- */
-void outliner_free_tree(ListBase *lb);
+void outliner_free_tree(ListBase *tree);
void outliner_cleanup_tree(struct SpaceOops *soops);
+void outliner_free_tree_element(TreeElement *element, ListBase *parent_subtree);
void outliner_remove_treestore_element(struct SpaceOops *soops, TreeStoreElem *tselem);
void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct ViewLayer *view_layer, struct SpaceOops *soops);