diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 11:13:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-13 11:13:28 +0400 |
commit | 6bd58ac967d2d1094fda4a9b0d8fd3e3107ec822 (patch) | |
tree | 67c19fa5d510eb359ff223102442ddc2d8e189f8 /source/blender/blenkernel/intern/curve.c | |
parent | 2e478ca76daf0c103815c5fa5c71369bdb3fbbec (diff) |
fix [#35335] Crash when rendering a text object with a remesh modifier and a material texture
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index f531c6526dd..35f99806df0 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1328,7 +1328,7 @@ float *BKE_curve_surf_make_orco(Object *ob) /* NOTE: This routine is tied to the order of vertex * built by displist and as passed to the renderer. */ -float *BKE_curve_make_orco(Scene *scene, Object *ob) +float *BKE_curve_make_orco(Scene *scene, Object *ob, int *r_numVerts) { Curve *cu = ob->data; DispList *dl; @@ -1358,6 +1358,9 @@ float *BKE_curve_make_orco(Scene *scene, Object *ob) } } + if (r_numVerts) + *r_numVerts = numVerts; + fp = coord_array = MEM_mallocN(3 * sizeof(float) * numVerts, "cu_orco"); for (dl = disp.first; dl; dl = dl->next) { if (dl->type == DL_INDEX3) { |