diff options
| author | Robert Wenzlaff <rwenzlaff@soylent-green.com> | 2004-01-11 19:20:49 +0300 |
|---|---|---|
| committer | Robert Wenzlaff <rwenzlaff@soylent-green.com> | 2004-01-11 19:20:49 +0300 |
| commit | d0fd7d2fea2328dc5cdedf142a33a0f2548f6e9d (patch) | |
| tree | 4557f3a1773b4d56add0fcfdde097ceea4306afe /source | |
| parent | 73529471e7dfb165221d2f40a3382cdb4e9feb12 (diff) | |
- Potential future bug in simple subsurf (used & when should be ==).
- out of date comment in Displace code.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf.c | 2 | ||||
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/subsurf.c b/source/blender/blenkernel/intern/subsurf.c index 96e3c090b69..f80b97a72ad 100644 --- a/source/blender/blenkernel/intern/subsurf.c +++ b/source/blender/blenkernel/intern/subsurf.c @@ -930,7 +930,7 @@ static DispListMesh *subsurf_subdivide_to_displistmesh(HyperMesh *hme, short sub tmp->hasuvco= hme->hasuvco; tmp->orig_me= hme->orig_me; - if (type & ME_SIMPLE_SUBSURF) hypermesh_simple_subdivide(hme, tmp); + if (type == ME_SIMPLE_SUBSURF) hypermesh_simple_subdivide(hme, tmp); else hypermesh_subdivide(hme, tmp); /* default to CC subdiv. */ hypermesh_free(hme); diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 9944822b4e0..5480d5d3ccb 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -3188,7 +3188,7 @@ void displace_render_vert(ShadeInput *shi, VertRen *vr, float *scale) do_material_tex(shi); - /* 0.25 could become button once? */ + /* 0.5 could become button once? */ vr->co[0] += 0.5 * shi->displace[0] * scale[0] ; vr->co[1] += 0.5 * shi->displace[1] * scale[1] ; vr->co[2] += 0.5 * shi->displace[2] * scale[2] ; |