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:
authorYimingWu <xp8110@outlook.com>2020-11-10 05:50:26 +0300
committerYimingWu <xp8110@outlook.com>2020-11-10 05:50:26 +0300
commit64f573c8b5b1dddc1b75167d6bc0b8afac9a2d27 (patch)
tree1861233da1b228bf25e10936823663e20e5c96f5 /source/blender/depsgraph/intern
parent351cf10bf2f1f409fb77d98ca879d61085b352d8 (diff)
parentbff1707aaef367822f4fbb38dbc2477b74e643a4 (diff)
Merge remote-tracking branch 'origin/master' into lanpr-under-gp
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc
index c91dda87190..b7a5aa7c171 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc
@@ -25,9 +25,7 @@
#include "testing/testing.h"
-namespace blender {
-namespace deg {
-namespace tests {
+namespace blender::deg::tests {
class TestableRNANodeQuery : public RNANodeQuery {
public:
@@ -55,6 +53,4 @@ TEST(deg_builder_rna, contains)
EXPECT_FALSE(TestableRNANodeQuery::contains("pose.bone[\"location\"].scale[0]", "location"));
}
-} // namespace tests
-} // namespace deg
-} // namespace blender
+} // namespace blender::deg::tests