forked from bartvdbraak/blender
BI: fix counting of tangents, that was reset during recursion of init_render_nodetree
This commit is contained in:
parent
0e8570b415
commit
d0de2733d5
@ -1148,7 +1148,6 @@ static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode
|
|||||||
|
|
||||||
/* parses the geom+tex nodes */
|
/* parses the geom+tex nodes */
|
||||||
ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l);
|
ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l);
|
||||||
basemat->nmap_tangent_names_count = 0;
|
|
||||||
for (node = ntree->nodes.first; node; node = node->next) {
|
for (node = ntree->nodes.first; node; node = node->next) {
|
||||||
if (node->id) {
|
if (node->id) {
|
||||||
if (GS(node->id->name) == ID_MA) {
|
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. */
|
* mode_l will have it set when all node materials are shadeless. */
|
||||||
mat->mode_l = (mat->mode & MA_MODE_PIPELINE) | MA_SHLESS;
|
mat->mode_l = (mat->mode & MA_MODE_PIPELINE) | MA_SHLESS;
|
||||||
mat->mode2_l = mat->mode2 & MA_MODE2_PIPELINE;
|
mat->mode2_l = mat->mode2 & MA_MODE2_PIPELINE;
|
||||||
|
mat->nmap_tangent_names_count = 0;
|
||||||
init_render_nodetree(mat->nodetree, mat, r_mode, amb);
|
init_render_nodetree(mat->nodetree, mat, r_mode, amb);
|
||||||
|
|
||||||
if (!mat->nodetree->execdata)
|
if (!mat->nodetree->execdata)
|
||||||
|
Loading…
Reference in New Issue
Block a user