diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-01 19:37:21 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-01 19:37:21 +0300 |
| commit | 9710d4c84c6ecabf8eb315d4dde7017d2c68e11f (patch) | |
| tree | 05fae600e98b344cad7ae987287551e547cfa2dd /source/blender/render | |
| parent | c5a41f6e22614710b08c563eb35b1d712ee2c721 (diff) | |
| parent | 362c8baac402a069367901f53cb2c8d4e2f75c4b (diff) | |
Orange <-> bf-blender conflict, with 2.40 saved files the version-patch to
initialize the (soon obsolete) material layers was skipped, causing it all
to be rendered black.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index acac0d48e2c..3a5eb15d186 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2482,7 +2482,7 @@ void *shadepixel(float x, float y, int z, int facenr, int mask, float *col, floa /* ------ main shading loop -------- */ VECCOPY(shi.vno, shi.vn); - if(shi.mat->ml_flag & ML_RENDER) { + if(1) { //shi.mat->ml_flag & ML_RENDER) { shade_lamp_loop(&shi, &shr); /* clears shr */ |