diff options
| author | Alexander Ewering <blender@instinctive.de> | 2006-02-02 15:13:08 +0300 |
|---|---|---|
| committer | Alexander Ewering <blender@instinctive.de> | 2006-02-02 15:13:08 +0300 |
| commit | 6cede56718e5f0889b541be2de24fea54077442a (patch) | |
| tree | 5b328c7efa68af77f3ecebdfae7184a1371f874e /source | |
| parent | afb5a2acf51ec391c86be0b66e2cd0f220b0f7ba (diff) | |
Bug #3854: Extruded/Bevelled text objects didn't get the right materials
for front/back faces. This should also fix and enable overlapping extruded/
bevelled characters.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 2e7f821abd7..c435544ad9e 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -731,6 +731,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase) dl->parts= 1; dl->nr= len; dl->col= nu->mat_nr; + dl->charidx = nu->charidx; data= dl->verts; if(nu->flagu & 1) dl->type= DL_POLY; @@ -898,6 +899,7 @@ static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase) dlnew->parts= 1; dlnew->type= DL_POLY; dlnew->col= dl->col; + dlnew->charidx = dl->charidx; fp= dl->verts; dpoly= 3*dl->nr; @@ -917,6 +919,7 @@ static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase) dlnew->parts= 1; dlnew->type= DL_POLY; dlnew->col= dl->col; + dlnew->charidx= dl->charidx; fp= dl->verts+3*(dl->nr-1); dpoly= 3*dl->nr; @@ -1151,6 +1154,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender) dl->parts= 1; dl->nr= len; dl->col= nu->mat_nr; + dl->charidx= nu->charidx; dl->rt= nu->flag; data= dl->verts; @@ -1167,6 +1171,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender) BLI_addtail(dispbase, dl); dl->col= nu->mat_nr; + dl->charidx= nu->charidx; dl->rt= nu->flag; data= dl->verts; @@ -1256,6 +1261,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco) dl->parts= bl->nr; dl->nr= dlb->nr; dl->col= nu->mat_nr; + dl->charidx= nu->charidx; dl->rt= nu->flag; dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "col2"); bevp= (BevPoint *)(bl+1); |