summaryrefslogtreecommitdiffstats
path: root/core/object.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-10 15:38:53 +0200
committerGitHub <noreply@github.com>2020-05-10 15:38:53 +0200
commit6ab92464bc6356f3342c3efd1fc1bb1a5e4467d5 (patch)
tree405a85e89e036e2240c74ee850121d912e21704b /core/object.h
parent54b20a25b90c8c8d8dfd7f68d66d0ec57c71435f (diff)
parent69de7ce38c40c57a1fabe12c9e5a3eab903a4035 (diff)
downloadredot-engine-6ab92464bc6356f3342c3efd1fc1bb1a5e4467d5.tar.gz
Merge pull request #38621 from akien-mga/stylé-comme-jamais
Style: clang-format: Disable if statements and case labels on single line
Diffstat (limited to 'core/object.h')
-rw-r--r--core/object.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/object.h b/core/object.h
index b40aef2a42..3dec8a0480 100644
--- a/core/object.h
+++ b/core/object.h
@@ -346,7 +346,8 @@ protected:
return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set; \
} \
virtual bool _setv(const StringName &p_name, const Variant &p_property) { \
- if (m_inherits::_setv(p_name, p_property)) return true; \
+ if (m_inherits::_setv(p_name, p_property)) \
+ return true; \
if (m_class::_get_set() != m_inherits::_get_set()) { \
return _set(p_name, p_property); \
} \