1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/tree/tree_element_rna.cc b/source/blender/editors/space_outliner/tree/tree_element_rna.cc
index 0152f59268d..1aa30e1a99a 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_rna.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element_rna.cc
@@ -79,6 +79,8 @@ bool TreeElementRNACommon::expandPoll(const SpaceOutliner &) const
 TreeElementRNAStruct::TreeElementRNAStruct(TreeElement &legacy_te, PointerRNA &rna_ptr)
     : TreeElementRNACommon(legacy_te, rna_ptr)
 {
+  BLI_assert(legacy_te.store_elem->type == TSE_RNA_STRUCT);
+
   if (!isRNAValid()) {
     return;
   }
@@ -142,6 +144,8 @@ TreeElementRNAProperty::TreeElementRNAProperty(TreeElement &legacy_te,
                                                const int index)
     : TreeElementRNACommon(legacy_te, rna_ptr)
 {
+  BLI_assert(legacy_te.store_elem->type == TSE_RNA_PROPERTY);
+
   if (!isRNAValid()) {
     return;
   }
@@ -229,6 +233,9 @@ TreeElementRNAArrayElement::TreeElementRNAArrayElement(TreeElement &legacy_te,
                                                        const int index)
     : TreeElementRNACommon(legacy_te, rna_ptr)
 {
+  BLI_assert(legacy_te.store_elem->type == TSE_RNA_ARRAY_ELEM);
+
+  BLI_assert(legacy_te.parent && (legacy_te.parent->store_elem->type == TSE_RNA_PROPERTY));
   PropertyRNA *prop = reinterpret_cast<PropertyRNA *>(legacy_te_.parent->directdata);
   legacy_te_.directdata = prop;
   legacy_te_.index = index;