blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix failing view layer tests after recent changes to naming convention

This commit is contained in:
Brecht Van Lommel 2021-10-19 14:53:48 +02:00
parent 5b6dacb9eb
commit 7fa6794037
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/layer_test.cc
View File

@ -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);