diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-02 20:40:03 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-02 20:40:03 +0300 |
| commit | c1a4e42a75d16f50972007cf9608998fa207dc21 (patch) | |
| tree | 7526cb7783c64474722a19b99b940ae15d7ef4c4 /source/blender/render | |
| parent | 763695c0e88a928e9609ae3b4719b43cd455ca22 (diff) | |
Orange; another node update for reviewing.
Material Nodes now have input sockets, to override the actual Material
settings. If socket has no input, you can also edit Material settings here.
(Color picker, number slider).
Of course a load of options will become available here, first bugfixing!
(Oh, and enable fix thread render)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index d1f36cba345..8f3a18fe75e 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1369,10 +1369,6 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) memset(shr, 0, sizeof(ShadeResult)); - /* copy all relevant material vars, note, keep this synced with render_types.h */ - memcpy(&shi->r, &ma->r, 23*sizeof(float)); - /* set special cases */ - shi->har= ma->har; if((ma->mode & MA_RAYMIRROR)==0) shi->ray_mirror= 0.0; /* lights */ @@ -2517,6 +2513,10 @@ void *shadepixel(float x, float y, int z, int facenr, int mask, float *col, floa ntreeShaderExecTree(shi.mat->nodetree, &shi, &shr); } else { + /* copy all relevant material vars, note, keep this synced with render_types.h */ + memcpy(&shi.r, &shi.mat->r, 23*sizeof(float)); + shi.har= shi.mat->har; + shade_material_loop(&shi, &shr); } |