Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-05 04:33:59 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-05 04:33:59 +0400
commit5734d229a873dd873f30b7467c3ca81863c22c84 (patch)
treed6bc759236ba7361954234a8eb19af13894c0400 /source/blender/blenkernel/intern/curve.c
parent98752a1f3025a138b5a2f70f60a2cca1e89d2f66 (diff)
Fix #34867: cycles viewport render did not respect viewport visibility for
modifiers with text/curve/surface objects. This is because the code here did not yet support the distinction between generating the tesselated mesh at viewport/render resolution and generating a separate displist/derivedmesh for render that is not stored in the object but created and freed on the fly.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r--source/blender/blenkernel/intern/curve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 56f2237a61f..10c18fe94ad 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1418,7 +1418,7 @@ float *BKE_curve_make_orco(Scene *scene, Object *ob)
/* ***************** BEVEL ****************** */
-void BKE_curve_bevel_make(Scene *scene, Object *ob, ListBase *disp, int forRender)
+void BKE_curve_bevel_make(Scene *scene, Object *ob, ListBase *disp, int forRender, int renderResolution)
{
DispList *dl, *dlnew;
Curve *bevcu, *cu;
@@ -1442,7 +1442,7 @@ void BKE_curve_bevel_make(Scene *scene, Object *ob, ListBase *disp, int forRende
facy = cu->bevobj->size[1];
if (forRender) {
- BKE_displist_make_curveTypes_forRender(scene, cu->bevobj, &bevdisp, NULL, 0);
+ BKE_displist_make_curveTypes_forRender(scene, cu->bevobj, &bevdisp, NULL, 0, renderResolution);
dl = bevdisp.first;
}
else {