diff options
Diffstat (limited to 'source/blender/editors/space_outliner')
4 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 1b64efd0088..5d15e365dfa 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -1918,7 +1918,7 @@ static void outliner_draw_rnabuts( if (te->ys + 2 * UI_UNIT_Y >= region->v2d.cur.ymin && te->ys <= region->v2d.cur.ymax) { if (TreeElementRNAProperty *te_rna_prop = tree_element_cast<TreeElementRNAProperty>(te)) { ptr = &te->rnaptr; - prop = te_rna_prop->getRNAProperty(); + prop = te_rna_prop->getPropertyRNA(); if (!TSELEM_OPEN(tselem, space_outliner)) { if (RNA_property_type(prop) == PROP_POINTER) { @@ -1963,7 +1963,7 @@ static void outliner_draw_rnabuts( else if (TreeElementRNAArrayElement *te_rna_array_elem = tree_element_cast<TreeElementRNAArrayElement>(te)) { ptr = &te->rnaptr; - prop = te_rna_array_elem->getRNAProperty(); + prop = te_rna_array_elem->getPropertyRNA(); uiDefAutoButR(block, ptr, diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index 4d191ad0757..693fdc863ce 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -1756,7 +1756,7 @@ static void tree_element_to_path(TreeElement *te, * then free old path + swap them. */ if (TreeElementRNAProperty *tem_rna_prop = tree_element_cast<TreeElementRNAProperty>(tem)) { - PropertyRNA *prop = tem_rna_prop->getRNAProperty(); + PropertyRNA *prop = tem_rna_prop->getPropertyRNA(); if (RNA_property_type(prop) == PROP_POINTER) { /* for pointer we just append property name */ @@ -1825,7 +1825,7 @@ static void tree_element_to_path(TreeElement *te, /* step 3: if we've got an ID, add the current item to the path */ if (*id) { /* add the active property to the path */ - PropertyRNA *prop = tree_element_cast<TreeElementRNACommon>(te)->getRNAProperty(); + PropertyRNA *prop = tree_element_cast<TreeElementRNACommon>(te)->getPropertyRNA(); /* array checks */ if (tselem->type == TSE_RNA_ARRAY_ELEM) { @@ -1884,7 +1884,7 @@ static void do_outliner_drivers_editop(SpaceOutliner *space_outliner, short groupmode = KSP_GROUP_KSNAME; TreeElementRNACommon *te_rna = tree_element_cast<TreeElementRNACommon>(te); - PropertyRNA *prop = te_rna ? te_rna->getRNAProperty() : nullptr; + PropertyRNA *prop = te_rna ? te_rna->getPropertyRNA() : nullptr; /* check if RNA-property described by this selected element is an animatable prop */ if (prop && RNA_property_animateable(&te->rnaptr, prop)) { @@ -2083,8 +2083,8 @@ static void do_outliner_keyingset_editop(SpaceOutliner *space_outliner, /* check if RNA-property described by this selected element is an animatable prop */ if (TreeElementRNACommon *te_rna = tree_element_cast<TreeElementRNACommon>(te); - te_rna && te_rna->getRNAProperty() && - RNA_property_animateable(&te->rnaptr, te_rna->getRNAProperty())) { + te_rna && te_rna->getPropertyRNA() && + RNA_property_animateable(&te->rnaptr, te_rna->getPropertyRNA())) { /* get id + path + index info from the selected element */ tree_element_to_path(te, tselem, &id, &path, &array_index, &flag, &groupmode); } 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 b39ff74b03a..d33cd7005d7 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_rna.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_rna.cc @@ -73,7 +73,7 @@ bool TreeElementRNACommon::expandPoll(const SpaceOutliner &) const return isRNAValid(); } -PropertyRNA *TreeElementRNACommon::getRNAProperty() const +PropertyRNA *TreeElementRNACommon::getPropertyRNA() const { return nullptr; } @@ -118,7 +118,7 @@ void TreeElementRNAStruct::expand(SpaceOutliner &space_outliner) const legacy_te_.parent) : nullptr; /* auto open these cases */ - if (!parent_prop_te || (RNA_property_type(parent_prop_te->getRNAProperty()) == PROP_POINTER)) { + if (!parent_prop_te || (RNA_property_type(parent_prop_te->getPropertyRNA()) == PROP_POINTER)) { if (!tselem.used) { tselem.flag &= ~TSE_CLOSED; } @@ -231,7 +231,7 @@ void TreeElementRNAProperty::expand(SpaceOutliner &space_outliner) const } } -PropertyRNA *TreeElementRNAProperty::getRNAProperty() const +PropertyRNA *TreeElementRNAProperty::getPropertyRNA() const { return rna_prop_; } @@ -249,7 +249,7 @@ TreeElementRNAArrayElement::TreeElementRNAArrayElement(TreeElement &legacy_te, BLI_assert(legacy_te.parent && (legacy_te.parent->store_elem->type == TSE_RNA_PROPERTY)); legacy_te_.index = index; - char c = RNA_property_array_item_char(TreeElementRNAArrayElement::getRNAProperty(), index); + char c = RNA_property_array_item_char(TreeElementRNAArrayElement::getPropertyRNA(), index); legacy_te_.name = reinterpret_cast<char *>( MEM_callocN(sizeof(char[20]), "OutlinerRNAArrayName")); @@ -262,12 +262,12 @@ TreeElementRNAArrayElement::TreeElementRNAArrayElement(TreeElement &legacy_te, legacy_te_.flag |= TE_FREE_NAME; } -PropertyRNA *TreeElementRNAArrayElement::getRNAProperty() const +PropertyRNA *TreeElementRNAArrayElement::getPropertyRNA() const { /* Forward query to the parent (which is expected to be a #TreeElementRNAProperty). */ const TreeElementRNAProperty *parent_prop_te = tree_element_cast<TreeElementRNAProperty>( legacy_te_.parent); - return parent_prop_te ? parent_prop_te->getRNAProperty() : nullptr; + return parent_prop_te ? parent_prop_te->getPropertyRNA() : nullptr; } } // namespace blender::ed::outliner diff --git a/source/blender/editors/space_outliner/tree/tree_element_rna.hh b/source/blender/editors/space_outliner/tree/tree_element_rna.hh index bce527e724b..8f53a8b7f31 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_rna.hh +++ b/source/blender/editors/space_outliner/tree/tree_element_rna.hh @@ -47,7 +47,7 @@ class TreeElementRNACommon : public AbstractTreeElement { * If this element represents a property or is part of a property (array element), this returns * the property. Otherwise nullptr. */ - virtual PropertyRNA *getRNAProperty() const; + virtual PropertyRNA *getPropertyRNA() const; bool isRNAValid() const; }; @@ -70,7 +70,7 @@ class TreeElementRNAProperty : public TreeElementRNACommon { TreeElementRNAProperty(TreeElement &legacy_te, PointerRNA &rna_ptr, int index); void expand(SpaceOutliner &space_outliner) const override; - PropertyRNA *getRNAProperty() const override; + PropertyRNA *getPropertyRNA() const override; }; /* -------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ class TreeElementRNAArrayElement : public TreeElementRNACommon { public: TreeElementRNAArrayElement(TreeElement &legacy_te, PointerRNA &rna_ptr, int index); - PropertyRNA *getRNAProperty() const override; + PropertyRNA *getPropertyRNA() const override; }; } // namespace blender::ed::outliner |