Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-12-04 12:50:06 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-12-04 12:50:06 +0300
commitf0df46287adf8553bac03bbaf8bbe67ad8652080 (patch)
tree75830538f0c01079e2fb7a9de9713d5e79aefe25
parent6ed6741ee35930bf81fad9a5eb6bb17eea168725 (diff)
Cleanup: replace NULL with nullptr in C++ code
No functional changes.
-rw-r--r--source/blender/blenkernel/intern/layer_test.cc6
1 files 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<ViewLayer *>(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<ViewLayer *>(scene.view_layers.first);