diff options
author | Julian Eisel <julian@blender.org> | 2022-01-14 20:00:21 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-01-14 21:26:04 +0300 |
commit | e9a43a3b6060b57b75e42f27c288608352f000ea (patch) | |
tree | 0878652b226022fb24e0c94ecdbbdfaf3531c54b /source/blender/editors/space_outliner/outliner_draw.cc | |
parent | 9109ea0b969f94e614e7a52807b00f3cd9e9383f (diff) |
Cleanup: Remove Outliner C-API headers/wrappers
Basically this removes any C <-> C++ glue code. C++ types are accessed
directly via the public C++ APIs.
Contains some related changes like, moving functions that were
previously declared in a now removed header to a different file, whose
header is the more appropriate place (and the source file as well).
But generally I tried to avoid other changes.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.cc')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 07c25a57f08..bc4b4e4f3b8 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -79,7 +79,10 @@ #include "RNA_access.h" #include "outliner_intern.hh" -#include "tree/tree_display.h" +#include "tree/tree_display.hh" +#include "tree/tree_element.hh" + +using namespace blender::ed::outliner; /* Disable - this is far too slow - campbell. */ /* #define USE_GROUP_SELECT */ @@ -3861,9 +3864,10 @@ void draw_outliner(const bContext *C) const bool use_mode_column = (space_outliner->flag & SO_MODE_COLUMN) && (ELEM(space_outliner->outlinevis, SO_VIEW_LAYER, SO_SCENES)); - const bool use_warning_column = - ELEM(space_outliner->outlinevis, SO_LIBRARIES, SO_OVERRIDES_LIBRARY) && - outliner_tree_display_warnings_poll(space_outliner->runtime->tree_display); + const bool use_warning_column = ELEM(space_outliner->outlinevis, + SO_LIBRARIES, + SO_OVERRIDES_LIBRARY) && + space_outliner->runtime->tree_display->hasWarnings(); /* Draw outliner stuff (background, hierarchy lines and names). */ const float restrict_column_width = outliner_restrict_columns_width(space_outliner); |