diff options
author | Ton Roosendaal <ton@blender.org> | 2004-03-27 14:32:25 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-03-27 14:32:25 +0300 |
commit | d3670aa4be04ff89506146c9b8f1184c3093021a (patch) | |
tree | 8d155b710757c9a589e13805f5d69e7de89a795a /source | |
parent | 34693b400d40504885c90ae77e55832ae48e2f96 (diff) |
- bug fix #996
Apparently the reorganize of code in this c file, to merge the converter
routines for normal Mesh and subsurfed Mesh, cancelled out the fix I did
before to make sure Material option Wire correctly takes the OPTIM mode
into account.
Error was that it always rendered in OPTIM wire for subsurf, regardless
setting for subsurf.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 831288f1654..3c6af6f819b 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -1502,8 +1502,11 @@ static void init_render_mesh(Object *ob) v4= mfaceint->v4; flag= mfaceint->flag; puno= mfaceint->puno; - edcode= mfaceint->edcode; - } else { + /* if mfaceint, then dlm is not NULL too */ + if(dlm->flag & ME_OPT_EDGES) edcode= mfaceint->edcode; + else edcode= ME_V1V2|ME_V2V3|ME_V3V4|ME_V4V1; + } + else { mat_nr= mface->mat_nr; v1= mface->v1; v2= mface->v2; |