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/displist.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/displist.c')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 97923d23fb1..6486c4c150b 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1102,7 +1102,13 @@ static void add_orco_dm(Scene *scene, Object *ob, DerivedMesh *dm, DerivedMesh * dm->getVertCos(dm, orco); } else { - orco = (float(*)[3])BKE_curve_make_orco(scene, ob); + int totvert_curve; + orco = (float(*)[3])BKE_curve_make_orco(scene, ob, &totvert_curve); + if (totvert != totvert_curve) { + MEM_freeN(orco); + orco = MEM_callocN(sizeof(float) * 3 * totvert, "dm orco"); + dm->getVertCos(dm, orco); + } } for (a = 0; a < totvert; a++) { |