diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-03-08 15:10:48 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-03-08 15:10:48 +0800 |
| commit | 87be945d49e1f53a34f7e4a27fa9b17e527b43c4 (patch) | |
| tree | c1fb9e1ac10bac08c25c31bbf3a29848b90a4c49 /drivers/gles2/shader_compiler_gles2.cpp | |
| parent | f5d2e1f42cca1c5b078073133fccda63c556a0da (diff) | |
| parent | 2c2894ceb674927a35d2798b3e63adabdb020077 (diff) | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Diffstat (limited to 'drivers/gles2/shader_compiler_gles2.cpp')
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index d8841d407e..b2052c7cbb 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -261,6 +261,11 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a uses_light=true; } + if (vnode->name==vname_normal) { + uses_normal=true; + } + + } if (vnode->name==vname_time) { @@ -636,7 +641,7 @@ Error ShaderCompilerGLES2::compile(const String& p_code, ShaderLanguage::ShaderT r_flags.uses_light=uses_light; r_flags.uses_time=uses_time; r_flags.uses_normalmap=uses_normalmap; - r_flags.uses_normal=uses_normalmap; + r_flags.uses_normal=uses_normal; r_flags.uses_texpixel_size=uses_texpixel_size; r_flags.uses_worldvec=uses_worldvec; r_code_line=code; |