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
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-25 01:21:10 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-25 01:25:06 +0300
commitd966c2f0c2ad256adc70046b59b73004f5e21a7e (patch)
treee64eebfae9765bc8a1b284cfa9e0b74a82f751b0 /source
parent78e3a7b3532ef9c196eff6e2691346acc64e4954 (diff)
Fix T63869: disable outliner show parent hierarchy temporarily
This is likely to cause crashes in many file, so disable this feature until it is fixed.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index a2f332b0795..83fcccff20b 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1478,6 +1478,7 @@ static void outliner_make_object_parent_hierarchy(ListBase *lb)
}
}
+#if 0
static void outliner_make_object_parent_hierarchy_recursive(SpaceOutliner *soops,
GHash *parent_children_hash,
TreeElement *te_parent,
@@ -1579,6 +1580,7 @@ static void outliner_build_parent_children_tree_free(Main *bmain, GHash *parent_
}
}
}
+#endif
/* Sorting ------------------------------------------------------ */
@@ -2302,6 +2304,7 @@ void outliner_build_tree(
bool show_objects = !(soops->filter & SO_FILTER_NO_OBJECT);
outliner_add_view_layer(soops, &ten->subtree, ten, view_layer, show_objects);
+#if 0
if ((soops->filter & SO_FILTER_NO_CHILDREN) == 0) {
GHash *parent_children_hash = BLI_ghash_new(
BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__);
@@ -2310,6 +2313,7 @@ void outliner_build_tree(
outliner_build_parent_children_tree_free(mainvar, parent_children_hash);
BLI_ghash_free(parent_children_hash, NULL, NULL);
}
+#endif
}
}