svn merge -r 30566:30717 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / displist.c
index ed7d11872c1489ba6387258a989f884a7823016a..ca659faa9727201239964b13a13053942d646d1e 100644 (file)
@@ -63,6 +63,7 @@
 
 #include "BLO_sys_types.h" // for intptr_t support
 
+#include "ED_curve.h" /* for BKE_curve_nurbs */
 
 static void boundbox_displist(Object *ob);
 
@@ -196,10 +197,10 @@ void addnormalsDispList(Object *ob, ListBase *lb)
        
                                                normal_quad_v3( nor,v1, v3, v4, v2);
        
-                                               add_v3_v3v3(n1, n1, nor);
-                                               add_v3_v3v3(n2, n2, nor);
-                                               add_v3_v3v3(n3, n3, nor);
-                                               add_v3_v3v3(n4, n4, nor);
+                                               add_v3_v3(n1, nor);
+                                               add_v3_v3(n2, nor);
+                                               add_v3_v3(n3, nor);
+                                               add_v3_v3(n4, nor);
        
                                                v2= v1; v1+= 3;
                                                v4= v3; v3+= 3;
@@ -295,9 +296,9 @@ static Render *fastshade_get_render(Scene *scene)
        /* XXX ugly global still, but we can't do preview while rendering */
        if(G.rendering==0) {
                
-               Render *re= RE_GetRender("_Shade View_", RE_SLOT_DEFAULT);
+               Render *re= RE_GetRender("_Shade View_");
                if(re==NULL) {
-                       re= RE_NewRender("_Shade View_", RE_SLOT_DEFAULT);
+                       re= RE_NewRender("_Shade View_");
                
                        RE_Database_Baking(re, scene, 0, 0);    /* 0= no faces */
                }
@@ -311,7 +312,7 @@ static Render *fastshade_get_render(Scene *scene)
 /* called on file reading */
 void fastshade_free_render(void)
 {
-       Render *re= RE_GetRender("_Shade View_", RE_SLOT_DEFAULT);
+       Render *re= RE_GetRender("_Shade View_");
        
        if(re) {
                RE_Database_Free(re);
@@ -490,7 +491,7 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un
        float *orco, *vnors, *nors, imat[3][3], mat[4][4], vec[3];
        int a, i, need_orco, totface, totvert;
        CustomDataMask dataMask = CD_MASK_BAREMESH | CD_MASK_MCOL
-                                 | CD_MASK_MTFACE | CD_MASK_NORMAL;
+                                                         | CD_MASK_MTFACE | CD_MASK_NORMAL;
 
 
        init_fastshade_for_ob(re, ob, &need_orco, mat, imat);
@@ -575,9 +576,9 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un
                        char *col1= (char*)&col1base[j*4];
                        char *col2= (char*)(col2base?&col2base[j*4]:NULL);
                        float *vn = (mf->flag & ME_SMOOTH)?&vnors[3*vidx[j]]:n1;
-                       
-                       VECCOPY(vec, mv->co);
-                       mul_m4_v3(mat, vec);
+
+                       mul_v3_m4v3(vec, mat, mv->co);
+
                        vec[0]+= 0.001*vn[0];
                        vec[1]+= 0.001*vn[1];
                        vec[2]+= 0.001*vn[2];
@@ -688,8 +689,7 @@ void shadeDispList(Scene *scene, Base *base)
                                                
                                                a= dl->nr;              
                                                while(a--) {
-                                                       VECCOPY(vec, fp);
-                                                       mul_m4_v3(mat, vec);
+                                                       mul_v3_m4v3(vec, mat, fp);
                                                        
                                                        fastshade(vec, n1, fp, ma, (char *)col1, NULL);
                                                        
@@ -704,8 +704,7 @@ void shadeDispList(Scene *scene, Base *base)
                                                nor= dl->nors;
                                                
                                                while(a--) {
-                                                       VECCOPY(vec, fp);
-                                                       mul_m4_v3(mat, vec);
+                                                       mul_v3_m4v3(vec, mat, fp);
                                                        
                                                        n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2];
                                                        n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2];
@@ -742,8 +741,7 @@ void shadeDispList(Scene *scene, Base *base)
                                                
                                                a= dl->nr;              
                                                while(a--) {
-                                                       VECCOPY(vec, fp);
-                                                       mul_m4_v3(mat, vec);
+                                                       mul_v3_m4v3(vec, mat, fp);
                                                        
                                                        /* transpose ! */
                                                        n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2];
@@ -895,7 +893,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
                                data= dl->verts;
                                if(nu->flagu & CU_NURB_CYCLIC) dl->type= DL_POLY;
                                else dl->type= DL_SEGM;
-                               makeNurbcurve(nu, data, NULL, NULL, resolu, 3*sizeof(float));
+                               makeNurbcurve(nu, data, NULL, NULL, NULL, resolu, 3*sizeof(float));
                        }
                        else if(nu->type == CU_POLY) {
                                len= nu->pntsu;
@@ -925,7 +923,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase)
 }
 
 
-void filldisplist(ListBase *dispbase, ListBase *to)
+void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
 {
        EditVert *eve, *v1, *vlast;
        EditFace *efa;
@@ -1019,6 +1017,9 @@ void filldisplist(ListBase *dispbase, ListBase *to)
                                        index[0]= (intptr_t)efa->v1->tmp.l;
                                        index[1]= (intptr_t)efa->v2->tmp.l;
                                        index[2]= (intptr_t)efa->v3->tmp.l;
+
+                                       if(flipnormal)
+                                               SWAP(int, index[0], index[2]);
                                        
                                        index+= 3;
                                        efa= efa->next;
@@ -1095,13 +1096,13 @@ static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase)
                dl= dl->next;
        }
 
-       filldisplist(&front, dispbase);
-       filldisplist(&back, dispbase);
+       filldisplist(&front, dispbase, 1);
+       filldisplist(&back, dispbase, 0);
        
        freedisplist(&front);
        freedisplist(&back);
 
-       filldisplist(dispbase, dispbase);
+       filldisplist(dispbase, dispbase, 0);
        
 }
 
@@ -1113,7 +1114,7 @@ static void curve_to_filledpoly(Curve *cu, ListBase *nurb, ListBase *dispbase)
                bevels_to_filledpoly(cu, dispbase);
        }
        else {
-               filldisplist(dispbase, dispbase);
+               filldisplist(dispbase, dispbase, 0);
        }
 }
 
@@ -1169,20 +1170,30 @@ void makeDispListMBall(Scene *scene, Object *ob)
 {
        if(!ob || ob->type!=OB_MBALL) return;
 
+       // XXX: mball stuff uses plenty of global variables
+       //      while this is unchanged updating during render is unsafe
+       if(G.rendering) return;
+
        freedisplist(&(ob->disp));
-       
+
        if(ob->type==OB_MBALL) {
                if(ob==find_basis_mball(scene, ob)) {
-                       metaball_polygonize(scene, ob);
+                       metaball_polygonize(scene, ob, &ob->disp);
                        tex_space_mball(ob);
 
-                       object_deform_mball(ob);
+                       object_deform_mball(ob, &ob->disp);
                }
        }
        
        boundbox_displist(ob);
 }
 
+void makeDispListMBall_forRender(Scene *scene, Object *ob, ListBase *dispbase)
+{
+       metaball_polygonize(scene, ob, dispbase);
+       object_deform_mball(ob, dispbase);
+}
+
 static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int forRender, int editmode)
 {
        ModifierData *md = modifiers_getVirtualModifierList(ob);
@@ -1211,7 +1222,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl
        ModifierData *md = modifiers_getVirtualModifierList(ob);
        ModifierData *preTesselatePoint;
        Curve *cu= ob->data;
-       ListBase *nurb= cu->editnurb?cu->editnurb:&cu->nurb;
+       ListBase *nurb= BKE_curve_nurbs(cu);
        int numVerts = 0;
        int editmode = (!forRender && cu->editnurb);
        float (*originalVerts)[3] = NULL;
@@ -1274,19 +1285,52 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl
        *numVerts_r = numVerts;
 }
 
+static float (*displist_get_allverts (ListBase *dispbase, int *totvert))[3]
+{
+       DispList *dl;
+       float (*allverts)[3], *fp;
+
+       *totvert= 0;
+
+       for (dl=dispbase->first; dl; dl=dl->next)
+               *totvert+= (dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr;
+
+       allverts= MEM_mallocN((*totvert)*sizeof(float)*3, "displist_get_allverts allverts");
+       fp= (float*)allverts;
+       for (dl=dispbase->first; dl; dl=dl->next) {
+               int offs= 3 * ((dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr);
+               memcpy(fp, dl->verts, sizeof(float) * offs);
+               fp+= offs;
+       }
+
+       return allverts;
+}
+
+static void displist_apply_allverts(ListBase *dispbase, float (*allverts)[3])
+{
+       DispList *dl;
+       float *fp;
+
+       fp= (float*)allverts;
+       for (dl=dispbase->first; dl; dl=dl->next) {
+               int offs= 3 * ((dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr);
+               memcpy(dl->verts, fp, sizeof(float) * offs);
+               fp+= offs;
+       }
+}
+
 static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispbase,
        DerivedMesh **derivedFinal, int forRender, float (*originalVerts)[3], float (*deformedVerts)[3])
 {
        ModifierData *md = modifiers_getVirtualModifierList(ob);
        ModifierData *preTesselatePoint;
        Curve *cu= ob->data;
-       ListBase *nurb= cu->editnurb?cu->editnurb:&cu->nurb;
+       ListBase *nurb= BKE_curve_nurbs(cu);
        DispList *dl;
-       int required_mode;
+       int required_mode = 0, totvert = 0;
        int editmode = (!forRender && cu->editnurb);
        DerivedMesh *dm= NULL, *ndm;
-       float (*dmDeformedVerts)[3] = NULL;
-       int numVerts;
+       float (*vertCos)[3] = NULL;
 
        if(forRender) required_mode = eModifierMode_Render;
        else required_mode = eModifierMode_Realtime;
@@ -1299,7 +1343,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
                md = preTesselatePoint->next;
        }
 
-       if (*derivedFinal) {
+       if (derivedFinal && *derivedFinal) {
                (*derivedFinal)->release (*derivedFinal);
        }
 
@@ -1311,73 +1355,60 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
                if ((md->mode & required_mode) != required_mode) continue;
                if (mti->isDisabled && mti->isDisabled(md, forRender)) continue;
 
-               if(md->type==eModifierType_Curve && !dm) {
-                       /* need to put all verts in 1 block for curve deform */
-                       float *allverts = NULL, *fp;
-                       int totvert= 0;
-
-                       for (dl=dispbase->first; dl; dl=dl->next)
-                               totvert+= (dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr;
-
-                       fp= allverts= MEM_mallocN(totvert*sizeof(float)*3, "temp vert");
-                       for (dl=dispbase->first; dl; dl=dl->next) {
-                               int offs= 3 * ((dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr);
-                               memcpy(fp, dl->verts, sizeof(float) * offs);
-                               fp+= offs;
-                       }
-
-                       mti->deformVerts(md, ob, NULL, (float(*)[3]) allverts, totvert, forRender, editmode);
-
-                       if (allverts) {
-                               fp= allverts;
-                               for (dl=dispbase->first; dl; dl=dl->next) {
-                                       int offs= 3 * ((dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr);
-                                       memcpy(dl->verts, fp, sizeof(float) * offs);
-                                       fp+= offs;
-                               }
-                               MEM_freeN(allverts);
-                       }
-               } else if (mti->type == eModifierTypeType_OnlyDeform ||
+               if (mti->type == eModifierTypeType_OnlyDeform ||
                                (mti->type == eModifierTypeType_DeformOrConstruct && !dm)) {
                        if (dm) {
-                               if (!dmDeformedVerts) {
-                                       numVerts = dm->getNumVerts(dm);
-                                       dmDeformedVerts =
-                                               MEM_mallocN(sizeof(*dmDeformedVerts) * numVerts, "dfmv");
-                                       dm->getVertCos(dm, dmDeformedVerts);
+                               if (!vertCos) {
+                                       totvert = dm->getNumVerts(dm);
+                                       vertCos = MEM_mallocN(sizeof(*vertCos) * totvert, "dfmv");
+                                       dm->getVertCos(dm, vertCos);
                                }
 
-                               mti->deformVerts(md, ob, dm, dmDeformedVerts, numVerts, forRender, editmode);
+                               mti->deformVerts(md, ob, dm, vertCos, totvert, forRender, editmode);
                        } else {
-                               for (dl=dispbase->first; dl; dl=dl->next) {
-                                       mti->deformVerts(md, ob, dm, (float(*)[3]) dl->verts, (dl->type==DL_INDEX3)?dl->nr:dl->parts*dl->nr, forRender, editmode);
+                               if (!vertCos) {
+                                       vertCos= displist_get_allverts(dispbase, &totvert);
                                }
+
+                               mti->deformVerts(md, ob, NULL, vertCos, totvert, forRender, editmode);
                        }
                } else {
+                       if (!derivedFinal) {
+                               /* makeDisplistCurveTypes could be used for beveling, where derived mesh */
+                               /* is totally unnecessary, so we could stop modifiers applying */
+                               /* when we found constructive modifier but derived mesh is unwanted result */
+                               break;
+                       }
+
                        if (dm) {
-                               if (dmDeformedVerts) {
+                               if (vertCos) {
                                        DerivedMesh *tdm = CDDM_copy(dm);
                                        dm->release(dm);
                                        dm = tdm;
 
-                                       CDDM_apply_vert_coords(dm, dmDeformedVerts);
+                                       CDDM_apply_vert_coords(dm, vertCos);
                                        CDDM_calc_normals(dm);
                                }
                        } else {
+                               if (vertCos) {
+                                       displist_apply_allverts(dispbase, vertCos);
+                               }
+
                                if (ELEM(ob->type, OB_CURVE, OB_FONT) && (cu->flag & CU_DEFORM_FILL)) {
-                                       curve_to_filledpoly(cu, nurb, &cu->disp);
+                                       curve_to_filledpoly(cu, nurb, dispbase);
                                }
 
                                dm= CDDM_from_curve_customDB(ob, dispbase);
 
-                               if(dmDeformedVerts) {
-                                       CDDM_apply_vert_coords(dm, dmDeformedVerts);
-                                       CDDM_calc_normals(dm);
-                               }
-
                                CDDM_calc_normals(dm);
                        }
 
+                       if (vertCos) {
+                               /* Vertex coordinates were applied to necessary data, could free it */
+                               MEM_freeN(vertCos);
+                               vertCos= NULL;
+                       }
+
                        ndm = mti->applyModifier(md, ob, dm, forRender, editmode);
 
                        if (ndm) {
@@ -1386,26 +1417,29 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
                                if (dm && dm != ndm) /* Modifier  */
                                        dm->release (dm);
                                dm = ndm;
-
-                               if (dmDeformedVerts) {
-                                       MEM_freeN(dmDeformedVerts);
-                                       dmDeformedVerts= NULL;
-                               }
                        }
                }
        }
 
-       if(dm && dmDeformedVerts) {
-               DerivedMesh *tdm = CDDM_copy(dm);
-               dm->release(dm);
-               dm = tdm;
+       if (vertCos) {
+               if (dm) {
+                       DerivedMesh *tdm = CDDM_copy(dm);
+                       dm->release(dm);
+                       dm = tdm;
 
-               CDDM_apply_vert_coords(dm, dmDeformedVerts);
-               CDDM_calc_normals(dm);
-               MEM_freeN(dmDeformedVerts);
+                       CDDM_apply_vert_coords(dm, vertCos);
+                       CDDM_calc_normals(dm);
+                       MEM_freeN(vertCos);
+               } else {
+                       displist_apply_allverts(dispbase, vertCos);
+                       MEM_freeN(vertCos);
+                       vertCos= NULL;
+               }
        }
 
-       (*derivedFinal) = dm;
+       if (derivedFinal) {
+               (*derivedFinal) = dm;
+       }
 
        if (deformedVerts) {
                curve_applyVertexCos(ob->data, nurb, originalVerts);
@@ -1558,9 +1592,9 @@ void makeDispListSurf(Scene *scene, Object *ob, ListBase *dispbase,
        int numVerts;
        float (*originalVerts)[3];
        float (*deformedVerts)[3];
-               
+
        if(!forRender && cu->editnurb)
-               nubase= cu->editnurb;
+               nubase= ED_curve_editnurbs(cu);
        else
                nubase= &cu->nurb;
 
@@ -1571,22 +1605,25 @@ void makeDispListSurf(Scene *scene, Object *ob, ListBase *dispbase,
                if(forRender || nu->hide==0) {
                        if(nu->pntsv==1) {
                                len= SEGMENTSU(nu)*nu->resolu;
-                               
+
                                dl= MEM_callocN(sizeof(DispList), "makeDispListsurf");
                                dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts");
-                               
+
                                BLI_addtail(dispbase, dl);
                                dl->parts= 1;
                                dl->nr= len;
                                dl->col= nu->mat_nr;
                                dl->charidx= nu->charidx;
-                               dl->rt= nu->flag;
-                               
+
+                               /* dl->rt will be used as flag for render face and */
+                               /* CU_2D conflicts with R_NOPUNOFLIP */
+                               dl->rt= nu->flag & ~CU_2D;
+
                                data= dl->verts;
                                if(nu->flagu & CU_NURB_CYCLIC) dl->type= DL_POLY;
                                else dl->type= DL_SEGM;
-                               
-                               makeNurbcurve(nu, data, NULL, NULL, nu->resolu, 3*sizeof(float));
+
+                               makeNurbcurve(nu, data, NULL, NULL, NULL, nu->resolu, 3*sizeof(float));
                        }
                        else {
                                len= (nu->pntsu*nu->resolu) * (nu->pntsv*nu->resolv);
@@ -1597,11 +1634,14 @@ void makeDispListSurf(Scene *scene, Object *ob, ListBase *dispbase,
 
                                dl->col= nu->mat_nr;
                                dl->charidx= nu->charidx;
-                               dl->rt= nu->flag;
-                               
+
+                               /* dl->rt will be used as flag for render face and */
+                               /* CU_2D conflicts with R_NOPUNOFLIP */
+                               dl->rt= nu->flag & ~CU_2D;
+
                                data= dl->verts;
                                dl->type= DL_SURF;
-                               
+
                                dl->parts= (nu->pntsu*nu->resolu);      /* in reverse, because makeNurbfaces works that way */
                                dl->nr= (nu->pntsv*nu->resolv);
                                if(nu->flagv & CU_NURB_CYCLIC) dl->flag|= DL_CYCL_U;    /* reverse too! */
@@ -1642,10 +1682,16 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                float (*deformedVerts)[3];
                int numVerts;
 
-               if(cu->editnurb)
-                       nubase= cu->editnurb;
-               else
-                       nubase= &cu->nurb;
+               /* Bevel and taper objects should always be curves */
+               if (cu->bevobj && cu->bevobj->type != OB_CURVE) {
+                       cu->bevobj = NULL;
+               }
+
+               if (cu->taperobj && cu->taperobj->type != OB_CURVE) {
+                       cu->taperobj = NULL;
+               }
+
+               nubase= BKE_curve_nurbs(cu);
 
                BLI_freelistN(&(cu->bev));
 
@@ -1659,7 +1705,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                makeBevelList(ob);
 
                /* If curve has no bevel will return nothing */
-               makebevelcurve(scene, ob, &dlbev);
+               makebevelcurve(scene, ob, &dlbev, forRender);
 
                /* no bevel or extrude, and no width correction? */
                if (!dlbev.first && cu->width==1.0f) {
@@ -1674,26 +1720,29 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                                float *fp1, *data;
                                BevPoint *bevp;
                                int a,b;
-                               
+
                                if (bl->nr) { /* blank bevel lists can happen */
-                                       
+
                                        /* exception handling; curve without bevel or extrude, with width correction */
                                        if(dlbev.first==NULL) {
                                                dl= MEM_callocN(sizeof(DispList), "makeDispListbev");
                                                dl->verts= MEM_callocN(3*sizeof(float)*bl->nr, "dlverts");
                                                BLI_addtail(dispbase, dl);
-                                               
+
                                                if(bl->poly!= -1) dl->type= DL_POLY;
                                                else dl->type= DL_SEGM;
-                                               
+
                                                if(dl->type==DL_SEGM) dl->flag = (DL_FRONT_CURVE|DL_BACK_CURVE);
-                                               
+
                                                dl->parts= 1;
                                                dl->nr= bl->nr;
                                                dl->col= nu->mat_nr;
                                                dl->charidx= nu->charidx;
-                                               dl->rt= nu->flag;
-                                               
+
+                                               /* dl->rt will be used as flag for render face and */
+                                               /* CU_2D conflicts with R_NOPUNOFLIP */
+                                               dl->rt= nu->flag & ~CU_2D;
+
                                                a= dl->nr;
                                                bevp= (BevPoint *)(bl+1);
                                                data= dl->verts;
@@ -1707,10 +1756,10 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                                        }
                                        else {
                                                DispList *dlb;
-                                               
+
                                                for (dlb=dlbev.first; dlb; dlb=dlb->next) {
        
-                                                               /* for each part of the bevel use a separate displblock */
+                                                       /* for each part of the bevel use a separate displblock */
                                                        dl= MEM_callocN(sizeof(DispList), "makeDispListbev1");
                                                        dl->verts= data= MEM_callocN(3*sizeof(float)*dlb->nr*bl->nr, "dlverts");
                                                        BLI_addtail(dispbase, dl);
@@ -1725,11 +1774,15 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                                                        dl->nr= dlb->nr;
                                                        dl->col= nu->mat_nr;
                                                        dl->charidx= nu->charidx;
-                                                       dl->rt= nu->flag;
+
+                                                       /* dl->rt will be used as flag for render face and */
+                                                       /* CU_2D conflicts with R_NOPUNOFLIP */
+                                                       dl->rt= nu->flag & ~CU_2D;
+
                                                        dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "col2");
                                                        bevp= (BevPoint *)(bl+1);
        
-                                                               /* for each point of poly make a bevel piece */
+                                                       /* for each point of poly make a bevel piece */
                                                        bevp= (BevPoint *)(bl+1);
                                                        for(a=0; a<bl->nr; a++,bevp++) {
                                                                float fac=1.0;
@@ -1739,7 +1792,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                                                                } else {
                                                                        fac = calc_taper(scene, cu->taperobj, a, bl->nr);
                                                                }
-                                                               
+
                                                                if (bevp->split_tag) {
                                                                        dl->bevelSplitFlag[a>>5] |= 1<<(a&0x1F);
                                                                }
@@ -1753,9 +1806,9 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                                                                                vec[0]= fp1[1]+widfac;
                                                                                vec[1]= fp1[2];
                                                                                vec[2]= 0.0;
-                                                                               
+
                                                                                mul_qt_v3(bevp->quat, vec);
-                                                                               
+
                                                                                data[0]= bevp->vec[0] + fac*vec[0];
                                                                                data[1]= bevp->vec[1] + fac*vec[1];
                                                                                data[2]= bevp->vec[2] + fac*vec[2];
@@ -1784,9 +1837,9 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
 
                if(cu->flag & CU_PATH) calc_curvepath(ob);
 
-               if (!forRender) {
-                       tex_space_curve(cu);
-               }
+                if (!forRender) {
+                        tex_space_curve(cu);
+                }
 
                if(!forOrco) curve_calc_modifiers_post(scene, ob, dispbase, derivedFinal, forRender, originalVerts, deformedVerts);
 
@@ -1811,6 +1864,12 @@ void makeDispListCurveTypes(Scene *scene, Object *ob, int forOrco)
                DM_set_object_boundbox (ob, ob->derivedFinal);
        } else {
                boundbox_displist (ob);
+
+               /* if there is no derivedMesh, object's boundbox is unneeded */
+               if (ob->bb) {
+                       MEM_freeN(ob->bb);
+                       ob->bb= NULL;
+               }
        }
 }