[Bf-blender-cvs] [25e95ccb1a3] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 25e95ccb1a353bad37346dbc988b3c2d181114db
Author: Hans Goudey
Date:   Wed Mar 31 11:41:58 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB25e95ccb1a353bad37346dbc988b3c2d181114db

Merge branch 'master' into geometry-nodes-curve-support

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/displist.cc
index 9be77e198e2,829f9a94b66..dc7523bc0de
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@@ -132,15 -129,11 +129,11 @@@ void BKE_displist_copy(ListBase *lbn, L
    BKE_displist_free(lbn);
  
    LISTBASE_FOREACH (const DispList *, dl, lb) {
 -    DispList *dln = MEM_dupallocN(dl);
 +    DispList *dln = (DispList *)MEM_dupallocN(dl);
      BLI_addtail(lbn, dln);
 -    dln->verts = MEM_dupallocN(dl->verts);
 -    dln->nors = MEM_dupallocN(dl->nors);
 -    dln->index = MEM_dupallocN(dl->index);
 +    dln->verts = (float *)MEM_dupallocN(dl->verts);
 +    dln->nors = (float *)MEM_dupallocN(dl->nors);
 +    dln->index = (int *)MEM_dupallocN(dl->index);
- 
-     if (dl->bevel_split) {
-       dln->bevel_split = (unsigned int *)MEM_dupallocN(dl->bevel_split);
-     }
    }
  }