[Bf-blender-cvs] [99b4c856ef9] master: Cleanup: remove commented function

Campbell Barton noreply at git.blender.org
Wed Feb 17 05:06:59 CET 2021


Commit: 99b4c856ef9140e96eb48c95cff04031ae36eeef
Author: Campbell Barton
Date:   Wed Feb 17 14:49:34 2021 +1100
Branches: master
https://developer.blender.org/rB99b4c856ef9140e96eb48c95cff04031ae36eeef

Cleanup: remove commented function

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

M	source/blender/blenkernel/intern/displist.c

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

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 19ead2d972a..1fcc1b1bcef 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -293,169 +293,6 @@ bool BKE_displist_surfindex_get(DispList *dl, int a, int *b, int *p1, int *p2, i
 #  pragma intel optimization_level 1
 #endif
 
-// static void curve_to_displist(Curve *cu,
-//                               ListBase *nubase,
-//                               const bool for_render,
-//                               ListBase *dispbase)
-// {
-//   DispList *dl;
-//   BezTriple *bezt, *prevbezt;
-//   BPoint *bp;
-//   float *data;
-//   int a, len, resolu;
-//   const bool editmode = (!for_render && (cu->editnurb || cu->editfont));
-
-//   LISTBASE_FOREACH (Nurb *, nu, nubase) {
-//     if (nu->hide != 0 && editmode) {
-//       continue;
-//     }
-
-//     if (for_render && cu->resolu_ren != 0) {
-//       resolu = cu->resolu_ren;
-//     }
-//     else {
-//       resolu = nu->resolu;
-//     }
-
-//     if (!BKE_nurb_check_valid_u(nu)) {
-//       /* pass */
-//     }
-//     else if (nu->type == CU_BEZIER) {
-//       /* count */
-//       len = 0;
-//       a = nu->pntsu - 1;
-//       if (nu->flagu & CU_NURB_CYCLIC) {
-//         a++;
-//       }
-
-//       prevbezt = nu->bezt;
-//       bezt = prevbezt + 1;
-//       while (a--) {
-//         if (a == 0 && (nu->flagu & CU_NURB_CYCLIC)) {
-//           bezt = nu->bezt;
-//         }
-
-//         if (prevbezt->h2 == HD_VECT && bezt->h1 == HD_VECT) {
-//           len++;
-//         }
-//         else {
-//           len += resolu;
-//         }
-
-//         if (a == 0 && (nu->flagu & CU_NURB_CYCLIC) == 0) {
-//           len++;
-//         }
-
-//         prevbezt = bezt;
-//         bezt++;
-//       }
-
-//       dl = MEM_callocN(sizeof(DispList), "makeDispListbez");
-//       /* len+1 because of 'forward_diff_bezier' function */
-//       dl->verts = MEM_mallocN((len + 1) * sizeof(float[3]), "dlverts");
-//       BLI_addtail(dispbase, dl);
-//       dl->parts = 1;
-//       dl->nr = len;
-//       dl->col = nu->mat_nr;
-//       dl->charidx = nu->charidx;
-
-//       data = dl->verts;
-
-//       /* check that (len != 2) so we don't immediately loop back on ourselves */
-//       if (nu->flagu & CU_NURB_CYCLIC && (dl->nr != 2)) {
-//         dl->type = DL_POLY;
-//         a = nu->pntsu;
-//       }
-//       else {
-//         dl->type = DL_SEGM;
-//         a = nu->pntsu - 1;
-//       }
-
-//       prevbezt = nu->bezt;
-//       bezt = prevbezt + 1;
-
-//       while (a--) {
-//         if (a == 0 && dl->type == DL_POLY) {
-//           bezt = nu->bezt;
-//         }
-
-//         if (prevbezt->h2 == HD_VECT && bezt->h1 == HD_VECT) {
-//           copy_v3_v3(data, prevbezt->vec[1]);
-//           data += 3;
-//         }
-//         else {
-//           int j;
-//           for (j = 0; j < 3; j++) {
-//             BKE_curve_forward_diff_bezier(prevbezt->vec[1][j],
-//                                           prevbezt->vec[2][j],
-//                                           bezt->vec[0][j],
-//                                           bezt->vec[1][j],
-//                                           data + j,
-//                                           resolu,
-//                                           sizeof(float[3]));
-//           }
-
-//           data += 3 * resolu;
-//         }
-
-//         if (a == 0 && dl->type == DL_SEGM) {
-//           copy_v3_v3(data, bezt->vec[1]);
-//         }
-
-//         prevbezt = bezt;
-//         bezt++;
-//       }
-//     }
-//     else if (nu->type == CU_NURBS) {
-//       len = (resolu * SEGMENTSU(nu));
-
-//       dl = MEM_callocN(sizeof(DispList), "makeDispListsurf");
-//       dl->verts = MEM_mallocN(len * sizeof(float[3]), "dlverts");
-//       BLI_addtail(dispbase, dl);
-//       dl->parts = 1;
-
-//       dl->nr = len;
-//       dl->col = nu->mat_nr;
-//       dl->charidx = nu->charidx;
-
-//       data = dl->verts;
-//       if (nu->flagu & CU_NURB_CYCLIC) {
-//         dl->type = DL_POLY;
-//       }
-//       else {
-//         dl->type = DL_SEGM;
-//       }
-//       BKE_nurb_makeCurve(nu, data, NULL, NULL, NULL, resolu, sizeof(float[3]));
-//     }
-//     else if (nu->type == CU_POLY) {
-//       len = nu->pntsu;
-//       dl = MEM_callocN(sizeof(DispList), "makeDispListpoly");
-//       dl->verts = MEM_mallocN(len * sizeof(float[3]), "dlverts");
-//       BLI_addtail(dispbase, dl);
-//       dl->parts = 1;
-//       dl->nr = len;
-//       dl->col = nu->mat_nr;
-//       dl->charidx = nu->charidx;
-
-//       data = dl->verts;
-//       if ((nu->flagu & CU_NURB_CYCLIC) && (dl->nr != 2)) {
-//         dl->type = DL_POLY;
-//       }
-//       else {
-//         dl->type = DL_SEGM;
-//       }
-
-//       a = len;
-//       bp = nu->bp;
-//       while (a--) {
-//         copy_v3_v3(data, bp->vec);
-//         bp++;
-//         data += 3;
-//       }
-//     }
-//   }
-// }
-
 static void curve_to_displist(const Curve *cu,
                               const ListBase *nubase,
                               const bool for_render,



More information about the Bf-blender-cvs mailing list