diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2016-06-01 12:28:48 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2016-06-01 12:28:48 +0300 |
| commit | d0de2733d5c9efd9a9054541d8b7398e0355823b (patch) | |
| tree | 062656bb451dfc469937bd4bb95af4ae90dbb243 /source | |
| parent | 0e8570b4158807e6a0cfcfb50dc17517740eca7d (diff) | |
BI: fix counting of tangents, that was reset during recursion of init_render_nodetree
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 1fec725dbb7..30f82a50ed9 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1148,7 +1148,6 @@ static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode /* parses the geom+tex nodes */ ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l); - basemat->nmap_tangent_names_count = 0; for (node = ntree->nodes.first; node; node = node->next) { if (node->id) { if (GS(node->id->name) == ID_MA) { @@ -1199,7 +1198,7 @@ void init_render_material(Material *mat, int r_mode, float *amb) * mode_l will have it set when all node materials are shadeless. */ mat->mode_l = (mat->mode & MA_MODE_PIPELINE) | MA_SHLESS; mat->mode2_l = mat->mode2 & MA_MODE2_PIPELINE; - + mat->nmap_tangent_names_count = 0; init_render_nodetree(mat->nodetree, mat, r_mode, amb); if (!mat->nodetree->execdata) |