[Bf-blender-cvs] [7fa67940375] master: Fix failing view layer tests after recent changes to naming convention
Brecht Van Lommel
noreply at git.blender.org
Tue Oct 19 14:55:11 CEST 2021
Commit: 7fa6794037577d467f3b01da2becdf0a060ff3ba
Author: Brecht Van Lommel
Date: Tue Oct 19 14:53:48 2021 +0200
Branches: master
https://developer.blender.org/rB7fa6794037577d467f3b01da2becdf0a060ff3ba
Fix failing view layer tests after recent changes to naming convention
===================================================================
M source/blender/blenkernel/intern/layer_test.cc
===================================================================
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);
More information about the Bf-blender-cvs
mailing list