diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2019-09-14 00:37:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-02-11 12:01:22 +0100 |
| commit | 6deffa62fbd1e91873afa663630b788b9ffabee3 (patch) | |
| tree | e77c1a67c8b8ddb64429280131502f64c8cd8e8c /servers/visual/rasterizer_rd/shader_compiler_rd.cpp | |
| parent | 9d7b7f931b6924399903e4954a0c32d59c15d4c3 (diff) | |
| download | redot-engine-6deffa62fbd1e91873afa663630b788b9ffabee3.tar.gz | |
Several fixes to 3D rendering, and multimesh implementation.
Diffstat (limited to 'servers/visual/rasterizer_rd/shader_compiler_rd.cpp')
| -rw-r--r-- | servers/visual/rasterizer_rd/shader_compiler_rd.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/visual/rasterizer_rd/shader_compiler_rd.cpp b/servers/visual/rasterizer_rd/shader_compiler_rd.cpp index 3908fbec3f..1aa48a82fc 100644 --- a/servers/visual/rasterizer_rd/shader_compiler_rd.cpp +++ b/servers/visual/rasterizer_rd/shader_compiler_rd.cpp @@ -482,8 +482,10 @@ String ShaderCompilerRD::_dump_node_code(const SL::Node *p_node, int p_level, Ge //code for functions for (int i = 0; i < pnode->functions.size(); i++) { SL::FunctionNode *fnode = pnode->functions[i].function; + function = fnode; current_func_name = fnode->name; function_code[fnode->name] = _dump_node_code(fnode->body, p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); + function = NULL; } //place functions in actual code @@ -763,7 +765,6 @@ String ShaderCompilerRD::_dump_node_code(const SL::Node *p_node, int p_level, Ge sampler_name = actions.custom_samplers[texture_uniform]; } else { if (shader->uniforms.has(texture_uniform)) { - print_line("shader from texture uniform " + itos(shader->uniforms[texture_uniform].filter) + ", " + itos(shader->uniforms[texture_uniform].repeat)); sampler_name = _get_sampler_name(shader->uniforms[texture_uniform].filter, shader->uniforms[texture_uniform].repeat); } else { bool found = false; |