diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_curve.h | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index b1020464728..f468415ef3d 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -81,11 +81,11 @@ void BKE_curve_material_index_clear(struct Curve *cu); ListBase *BKE_curve_nurbs_get(struct Curve *cu); -float (*BKE_curve_vertexCos_get(struct Curve *cu, struct ListBase *lb, int *numVerts_r))[3]; -void BK_curve_vertexCos_apply(struct Curve *cu, struct ListBase *lb, float (*vertexCos)[3]); +float (*BKE_curve_nurbs_vertexCos_get(struct ListBase *lb, int *numVerts_r))[3]; +void BK_curve_nurbs_vertexCos_apply(struct ListBase *lb, float (*vertexCos)[3]); -float (*BKE_curve_keyVertexCos_get(struct Curve *cu, struct ListBase *lb, float *key))[3]; -void BKE_curve_keyVertexTilts_apply(struct Curve *cu, struct ListBase *lb, float *key); +float (*BKE_curve_nurbs_keyVertexCos_get(struct ListBase *lb, float *key))[3]; +void BKE_curve_nurbs_keyVertexTilts_apply(struct ListBase *lb, float *key); void BKE_curve_editNurb_keyIndex_free(struct EditNurb *editnurb); void BKE_curve_editNurb_free(struct Curve *cu); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 8fa24ecbbe5..8f6b4e002bd 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3374,7 +3374,7 @@ void BKE_nurb_direction_switch(Nurb *nu) } -float (*BKE_curve_vertexCos_get(Curve *UNUSED(cu), ListBase *lb, int *numVerts_r))[3] +float (*BKE_curve_nurbs_vertexCos_get(ListBase *lb, int *numVerts_r))[3] { int i, numVerts = *numVerts_r = BKE_nurbList_verts_count(lb); float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos"); @@ -3403,7 +3403,7 @@ float (*BKE_curve_vertexCos_get(Curve *UNUSED(cu), ListBase *lb, int *numVerts_r return cos; } -void BK_curve_vertexCos_apply(Curve *UNUSED(cu), ListBase *lb, float (*vertexCos)[3]) +void BK_curve_nurbs_vertexCos_apply(ListBase *lb, float (*vertexCos)[3]) { float *co = vertexCos[0]; Nurb *nu; @@ -3431,7 +3431,7 @@ void BK_curve_vertexCos_apply(Curve *UNUSED(cu), ListBase *lb, float (*vertexCos } } -float (*BKE_curve_keyVertexCos_get(Curve *UNUSED(cu), ListBase *lb, float *key))[3] +float (*BKE_curve_nurbs_keyVertexCos_get(ListBase *lb, float *key))[3] { int i, numVerts = BKE_nurbList_verts_count(lb); float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos"); @@ -3462,7 +3462,7 @@ float (*BKE_curve_keyVertexCos_get(Curve *UNUSED(cu), ListBase *lb, float *key)) return cos; } -void BKE_curve_keyVertexTilts_apply(Curve *UNUSED(cu), ListBase *lb, float *key) +void BKE_curve_nurbs_keyVertexTilts_apply(ListBase *lb, float *key) { Nurb *nu; int i; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 3fb86c904bb..755068b53bb 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -825,7 +825,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, in * tilts, which is passed through in the modifier stack. * this is also the reason curves do not use a virtual * shape key modifier yet. */ - deformedVerts = BKE_curve_keyVertexCos_get(cu, nurb, keyVerts); + deformedVerts = BKE_curve_nurbs_keyVertexCos_get(nurb, keyVerts); originalVerts = MEM_dupallocN(deformedVerts); BLI_assert(BKE_nurbList_verts_count(nurb) == numVerts); } @@ -843,7 +843,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, in continue; if (!deformedVerts) { - deformedVerts = BKE_curve_vertexCos_get(cu, nurb, &numVerts); + deformedVerts = BKE_curve_nurbs_vertexCos_get(nurb, &numVerts); originalVerts = MEM_dupallocN(deformedVerts); } @@ -855,9 +855,9 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, in } if (deformedVerts) - BK_curve_vertexCos_apply(cu, nurb, deformedVerts); + BK_curve_nurbs_vertexCos_apply(nurb, deformedVerts); if (keyVerts) /* these are not passed through modifier stack */ - BKE_curve_keyVertexTilts_apply(cu, nurb, keyVerts); + BKE_curve_nurbs_keyVertexTilts_apply(nurb, keyVerts); if (keyVerts) MEM_freeN(keyVerts); @@ -1056,7 +1056,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba } if (deformedVerts) { - BK_curve_vertexCos_apply(ob->data, nurb, originalVerts); + BK_curve_nurbs_vertexCos_apply(nurb, originalVerts); MEM_freeN(originalVerts); MEM_freeN(deformedVerts); } diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 03d51fcbe82..0ba84e27420 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -637,9 +637,9 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, cu = ob->data; BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices"); - vertexCos = BKE_curve_vertexCos_get(cu, &cu->nurb, &numVerts); + vertexCos = BKE_curve_nurbs_vertexCos_get(&cu->nurb, &numVerts); mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0); - BK_curve_vertexCos_apply(cu, &cu->nurb, vertexCos); + BK_curve_nurbs_vertexCos_apply(&cu->nurb, vertexCos); MEM_freeN(vertexCos); |