diff options
Diffstat (limited to 'source/blender/editors/curve')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_paint.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 3b05975d22d..f8977b835b3 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6856,9 +6856,9 @@ int ED_curve_join_objects_exec(bContext *C, wmOperator *op) /* Compensate for different bevel depth. */ bool do_radius = false; float compensate_radius = 0.0f; - if (cu->ext2 != 0.0f && cu_active->ext2 != 0.0f) { + if (cu->bevel_radius != 0.0f && cu_active->bevel_radius != 0.0f) { float compensate_scale = mat4_to_scale(cmat); - compensate_radius = cu->ext2 / cu_active->ext2 * compensate_scale; + compensate_radius = cu->bevel_radius / cu_active->bevel_radius * compensate_scale; do_radius = true; } diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 784f67ac4f1..403ace56e3b 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -144,7 +144,7 @@ static float stroke_elem_radius_from_pressure(const struct CurveDrawData *cdd, const float pressure) { const Curve *cu = cdd->vc.obedit->data; - return ((pressure * cdd->radius.range) + cdd->radius.min) * cu->ext2; + return ((pressure * cdd->radius.range) + cdd->radius.min) * cu->bevel_radius; } static float stroke_elem_radius(const struct CurveDrawData *cdd, const struct StrokeElem *selem) @@ -364,7 +364,7 @@ static void curve_draw_stroke_3d(const struct bContext *UNUSED(C), Object *obedit = cdd->vc.obedit; Curve *cu = obedit->data; - if (cu->ext2 > 0.0f) { + if (cu->bevel_radius > 0.0f) { BLI_mempool_iter iter; const struct StrokeElem *selem; |