summaryrefslogtreecommitdiffstats
path: root/scene/resources/material.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-27 16:48:09 +0200
committerGitHub <noreply@github.com>2018-09-27 16:48:09 +0200
commit4cf5bb027678717263476e676cd23f881eef1ca1 (patch)
treea842d54e82a4998c8b593f86fef858560c10b4d2 /scene/resources/material.cpp
parentcb5a62903f9798da8b12f625cbd5a493f14e41d3 (diff)
parentcdc411fd54fbafc414b29abb1d50a0ff327f0d89 (diff)
downloadredot-engine-4cf5bb027678717263476e676cd23f881eef1ca1.tar.gz
Merge pull request #22446 from akien-mga/fix-warnings
Fix various warnings raised by GCC 5
Diffstat (limited to 'scene/resources/material.cpp')
-rw-r--r--scene/resources/material.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index cc8685b952..ce801c8763 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -427,10 +427,8 @@ void SpatialMaterial::_update_shader() {
if (flags[FLAG_USE_VERTEX_LIGHTING]) {
code += ",vertex_lighting";
}
- bool using_world = false;
if (flags[FLAG_TRIPLANAR_USE_WORLD] && (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR])) {
code += ",world_vertex_coords";
- using_world = true;
}
if (flags[FLAG_DONT_RECEIVE_SHADOWS]) {
code += ",shadows_disabled";