[Bf-blender-cvs] [9f9e2dd25d7] master: Cleanup: clang-tidy
Campbell Barton
noreply at git.blender.org
Thu Oct 7 16:25:47 CEST 2021
Commit: 9f9e2dd25d70d81a8ea9cd9164c1b221398cbaee
Author: Campbell Barton
Date: Fri Oct 8 01:24:12 2021 +1100
Branches: master
https://developer.blender.org/rB9f9e2dd25d70d81a8ea9cd9164c1b221398cbaee
Cleanup: clang-tidy
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/tree_view.cc
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 8fdc055a13b..c508cf2f36c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4836,7 +4836,7 @@ static int ui_do_but_TREEROW(bContext *C,
button_activate_state(C, but, BUTTON_STATE_EXIT);
return WM_UI_HANDLER_BREAK;
}
- else if (event->val == KM_DBL_CLICK) {
+ if (event->val == KM_DBL_CLICK) {
data->cancel = true;
UI_tree_view_item_begin_rename(tree_row_but->tree_item);
diff --git a/source/blender/editors/interface/tree_view.cc b/source/blender/editors/interface/tree_view.cc
index 5df9c21de4f..8ac69f862c8 100644
--- a/source/blender/editors/interface/tree_view.cc
+++ b/source/blender/editors/interface/tree_view.cc
@@ -198,12 +198,12 @@ void AbstractTreeViewItem::add_indent(uiLayout &row) const
uiLayoutSetFixedSize(subrow, true);
const float indent_size = count_parents() * UI_DPI_ICON_SIZE;
- uiDefBut(block, UI_BTYPE_SEPR, 0, "", 0, 0, indent_size, 0, NULL, 0.0, 0.0, 0, 0, "");
+ uiDefBut(block, UI_BTYPE_SEPR, 0, "", 0, 0, indent_size, 0, nullptr, 0.0, 0.0, 0, 0, "");
/* Indent items without collapsing icon some more within their parent. Makes it clear that they
* are actually nested and not just a row at the same level without a chevron. */
if (!is_collapsible() && parent_) {
- uiDefBut(block, UI_BTYPE_SEPR, 0, "", 0, 0, 0.2f * UI_UNIT_X, 0, NULL, 0.0, 0.0, 0, 0, "");
+ uiDefBut(block, UI_BTYPE_SEPR, 0, "", 0, 0, 0.2f * UI_UNIT_X, 0, nullptr, 0.0, 0.0, 0, 0, "");
}
/* Restore. */
More information about the Bf-blender-cvs
mailing list