diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-01 00:39:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-01 00:39:08 +0400 |
| commit | c19725b2667cfcec64135901ccb40b3c9ec37e00 (patch) | |
| tree | ad97abf53127e70559bc21f0696a91b65f7c0fe7 /source/blender/nodes/intern/SHD_nodes/SHD_material.c | |
| parent | 3c6a0274b94709e4b9767de5054c8a5402a97db3 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27895:27901; svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27902:27907, skipping 27902
Diffstat (limited to 'source/blender/nodes/intern/SHD_nodes/SHD_material.c')
| -rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_material.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c index d216ddf565a..3182fca8272 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c @@ -173,8 +173,17 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in, } /* copy passes, now just active node */ - if(node->flag & NODE_ACTIVE_ID) + if(node->flag & NODE_ACTIVE_ID) { + float combined[4], alpha; + + copy_v4_v4(combined, shcd->shr->combined); + alpha= shcd->shr->alpha; + *(shcd->shr)= shrnode; + + copy_v4_v4(shcd->shr->combined, combined); + shcd->shr->alpha= alpha; + } } } |