blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Cleanup: Outliner function names, simplify struct initialization

This commit is contained in:
Julian Eisel 2022-01-14 19:19:22 +01:00
parent 41495707d2
commit 67517c7d5c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/outliner_draw.cc
View File

@ -2185,7 +2185,7 @@ static bool outliner_draw_warning_tree_element(uiBlock *block,
int icon = ICON_NONE;
const char *tip = "";
const bool has_warning = outliner_element_warnings_get(te, &icon, &tip);
const bool has_warning = tree_element_warnings_get(te, &icon, &tip);
BLI_assert(has_warning);
UNUSED_VARS_NDEBUG(has_warning);

7
source/blender/editors/space_outliner/outliner_tree.cc
View File

@ -1116,7 +1116,7 @@ TreeElement *outliner_add_element(SpaceOutliner *space_outliner,
}
}
if (outliner_element_warnings_get(te, nullptr, nullptr)) {
if (tree_element_warnings_get(te, nullptr, nullptr)) {
te->flag |= TE_HAS_WARNING;
}
@ -1887,10 +1887,7 @@ void outliner_build_tree(Main *mainvar,
/* All tree displays should be created as sub-classes of AbstractTreeDisplay. */
BLI_assert(space_outliner->runtime->tree_display != nullptr);
TreeSourceData source_data{};
source_data.bmain = mainvar;
source_data.scene = scene;
source_data.view_layer = view_layer;
TreeSourceData source_data{*mainvar, *scene, *view_layer};
space_outliner->tree = space_outliner->runtime->tree_display->buildTree(source_data);
if ((space_outliner->flag & SO_SKIP_SORT_ALPHA) == 0) {

5
source/blender/editors/space_outliner/tree/tree_display.hh
View File

@ -56,6 +56,11 @@ struct TreeSourceData {
Main *bmain;
Scene *scene;
ViewLayer *view_layer;
TreeSourceData(Main &bmain, Scene &scene, ViewLayer &view_layer)
: bmain(&bmain), scene(&scene), view_layer(&view_layer)
{
}
};
/* -------------------------------------------------------------------- */

2
source/blender/editors/space_outliner/tree/tree_element.cc
View File

@ -105,7 +105,7 @@ void tree_element_expand(const AbstractTreeElement &tree_element, SpaceOutliner
tree_element.postExpand(space_outliner);
}
bool outliner_element_warnings_get(TreeElement *te, int *r_icon, const char **r_message)
bool tree_element_warnings_get(TreeElement *te, int *r_icon, const char **r_message)
{
TreeStoreElem *tselem = te->store_elem;

2
source/blender/editors/space_outliner/tree/tree_element.hh
View File

@ -107,6 +107,6 @@ void tree_element_expand(const AbstractTreeElement &tree_element, SpaceOutliner
* \param r_message The message to display as warning.
* \return true if there is a warning, false otherwise.
*/
bool outliner_element_warnings_get(struct TreeElement *te, int *r_icon, const char **r_message);
bool tree_element_warnings_get(struct TreeElement *te, int *r_icon, const char **r_message);
} // namespace blender::ed::outliner