[Bf-blender-cvs] [1b31d7bf472] temp-spreadsheet-row-filter: Use nullptr instead of NULL

Hans Goudey noreply at git.blender.org
Fri Apr 16 18:57:49 CEST 2021


Commit: 1b31d7bf4725b01201b44172239825283cdc53c6
Author: Hans Goudey
Date:   Wed Apr 14 11:32:26 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB1b31d7bf4725b01201b44172239825283cdc53c6

Use nullptr instead of NULL

===================================================================

M	source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

===================================================================

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index 7fa5a0904fc..185141b9276 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -223,9 +223,9 @@ static void spreadsheet_row_filters_layout(const bContext *C, Panel *panel)
     LISTBASE_FOREACH (SpreadsheetRowFilter *, row_filter, row_filters) {
 
       /* Move to the next instanced panel corresponding to the next filter. */
-      while ((panel->type == NULL) || !(panel->type->flag & PANEL_TYPE_INSTANCED)) {
+      while ((panel->type == nullptr) || !(panel->type->flag & PANEL_TYPE_INSTANCED)) {
         panel = panel->next;
-        BLI_assert(panel != NULL); /* There shouldn't be fewer panels than filters. */
+        BLI_assert(panel != nullptr); /* There shouldn't be fewer panels than filters. */
       }
 
       PointerRNA *filter_ptr = (PointerRNA *)MEM_mallocN(sizeof(PointerRNA), "panel customdata");



More information about the Bf-blender-cvs mailing list