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
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-01-03 22:45:08 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2011-01-03 22:45:08 +0300
commit522615536952c02fababd72ab9106c0a68a8071d (patch)
tree91840276abd39af54136e635fc7545d1c2779e39 /source
parent5eaad696e888fc5b6296c4fa855b0102cdf78187 (diff)
Memory for bevelSplitFlag wasn't duplicated in copy_displist.
Also corrected memory allocation comment for this array.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/displist.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index a6957d6ead1..0ee85624bee 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -150,7 +150,10 @@ void copy_displist(ListBase *lbn, ListBase *lb)
dln->index= MEM_dupallocN(dl->index);
dln->col1= MEM_dupallocN(dl->col1);
dln->col2= MEM_dupallocN(dl->col2);
-
+
+ if(dl->bevelSplitFlag)
+ dln->bevelSplitFlag= MEM_dupallocN(dl->bevelSplitFlag);
+
dl= dl->next;
}
}
@@ -1790,7 +1793,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
/* CU_2D conflicts with R_NOPUNOFLIP */
dl->rt= nu->flag & ~CU_2D;
- dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "col2");
+ dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "bevelSplitFlag");
bevp= (BevPoint *)(bl+1);
/* for each point of poly make a bevel piece */