From f0df46287adf8553bac03bbaf8bbe67ad8652080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 4 Dec 2020 10:50:06 +0100 Subject: [PATCH] Cleanup: replace NULL with nullptr in C++ code No functional changes. --- source/blender/blenkernel/intern/layer_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc index 84a96ed0895..e241c12d714 100644 --- a/source/blender/blenkernel/intern/layer_test.cc +++ b/source/blender/blenkernel/intern/layer_test.cc @@ -43,7 +43,7 @@ TEST(view_layer, aov_unique_names) IMB_init(); RE_engines_init(); - Scene scene = {{NULL}}; + Scene scene = {{nullptr}}; IDType_ID_SCE.init_data(&scene.id); ViewLayer *view_layer = static_cast(scene.view_layers.first); @@ -81,7 +81,7 @@ TEST(view_layer, aov_unique_names) /* Resolve by removing AOV resolution */ BKE_view_layer_remove_aov(view_layer, aov2); - aov2 = NULL; + aov2 = nullptr; BKE_view_layer_verify_aov(engine, &scene, view_layer); EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer)); EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0); @@ -136,7 +136,7 @@ TEST(view_layer, aov_conflict) IMB_init(); RE_engines_init(); - Scene scene = {{NULL}}; + Scene scene = {{nullptr}}; IDType_ID_SCE.init_data(&scene.id); ViewLayer *view_layer = static_cast(scene.view_layers.first);