[Bf-blender-cvs] [d966c2f0c2a] master: Fix T63869: disable outliner show parent hierarchy temporarily

Brecht Van Lommel noreply at git.blender.org
Thu Apr 25 00:25:44 CEST 2019


Commit: d966c2f0c2ad256adc70046b59b73004f5e21a7e
Author: Brecht Van Lommel
Date:   Thu Apr 25 00:21:10 2019 +0200
Branches: master
https://developer.blender.org/rBd966c2f0c2ad256adc70046b59b73004f5e21a7e

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.

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c

===================================================================

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
     }
   }



More information about the Bf-blender-cvs mailing list