From 7fa6794037577d467f3b01da2becdf0a060ff3ba Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 19 Oct 2021 14:53:48 +0200 Subject: [PATCH] Fix failing view layer tests after recent changes to naming convention --- source/blender/blenkernel/intern/layer_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc index c918c0cab67..b5f800dd181 100644 --- a/source/blender/blenkernel/intern/layer_test.cc +++ b/source/blender/blenkernel/intern/layer_test.cc @@ -69,7 +69,7 @@ TEST(view_layer, aov_unique_names) EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0); EXPECT_FALSE((aov2->flag & AOV_CONFLICT) != 0); EXPECT_TRUE(STREQ(aov1->name, "AOV")); - EXPECT_TRUE(STREQ(aov2->name, "AOV.001")); + EXPECT_TRUE(STREQ(aov2->name, "AOV_001")); /* Revert previous resolution */ BLI_strncpy(aov2->name, "AOV", MAX_NAME); @@ -78,7 +78,7 @@ TEST(view_layer, aov_unique_names) EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0); EXPECT_FALSE((aov2->flag & AOV_CONFLICT) != 0); EXPECT_TRUE(STREQ(aov1->name, "AOV")); - EXPECT_TRUE(STREQ(aov2->name, "AOV.001")); + EXPECT_TRUE(STREQ(aov2->name, "AOV_001")); /* Resolve by removing AOV resolution */ BKE_view_layer_remove_aov(view_layer, aov2);