summaryrefslogtreecommitdiff
path: root/scene/resources/environment.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-05-14 14:50:17 +0200
committerGitHub <noreply@github.com>2020-05-14 14:50:17 +0200
commit15b25b739dab84dcde99deaf29e75547ec941f45 (patch)
tree90aa672d8623d299282bf6f2bbb7216f6738cdf3 /scene/resources/environment.cpp
parent5f5f53e8eba5c9b708714de58d3cca6ceb010279 (diff)
parenta1aaed5a84e5206032495ee3d7447847aa8c9515 (diff)
Merge pull request #38736 from akien-mga/modernize-all-the-things
C++: Apply some `modernize-*` checks from clang-tidy (nullptr, bool literals, void args)
Diffstat (limited to 'scene/resources/environment.cpp')
-rw-r--r--scene/resources/environment.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 4647c38e04..abbe579307 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -164,7 +164,7 @@ float Environment::get_ambient_light_sky_contribution() const {
return ambient_sky_contribution;
}
-int Environment::get_camera_feed_id(void) const {
+int Environment::get_camera_feed_id() const {
return camera_feed_id;
}