Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/curve_eval.cc11
-rw-r--r--source/blender/blenkernel/intern/geometry_component_curve.cc6
2 files changed, 3 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/curve_eval.cc b/source/blender/blenkernel/intern/curve_eval.cc
index 19bbd8178b7..1679f21516a 100644
--- a/source/blender/blenkernel/intern/curve_eval.cc
+++ b/source/blender/blenkernel/intern/curve_eval.cc
@@ -50,17 +50,6 @@ void CurveEval::remove_splines(blender::IndexMask mask)
}
}
-CurveEval *CurveEval::copy()
-{
- CurveEval *new_curve = new CurveEval();
-
- for (SplinePtr &spline : this->splines()) {
- new_curve->add_spline(spline->copy());
- }
-
- return new_curve;
-}
-
void CurveEval::translate(const float3 &translation)
{
for (SplinePtr &spline : this->splines()) {
diff --git a/source/blender/blenkernel/intern/geometry_component_curve.cc b/source/blender/blenkernel/intern/geometry_component_curve.cc
index 44c5cce92dd..d6c7cae2727 100644
--- a/source/blender/blenkernel/intern/geometry_component_curve.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curve.cc
@@ -39,7 +39,7 @@ GeometryComponent *CurveComponent::copy() const
{
CurveComponent *new_component = new CurveComponent();
if (curve_ != nullptr) {
- new_component->curve_ = curve_->copy();
+ new_component->curve_ = new CurveEval(*curve_);
new_component->ownership_ = GeometryOwnershipType::Owned;
}
return new_component;
@@ -87,7 +87,7 @@ CurveEval *CurveComponent::get_for_write()
{
BLI_assert(this->is_mutable());
if (ownership_ == GeometryOwnershipType::ReadOnly) {
- curve_ = curve_->copy();
+ curve_ = new CurveEval(*curve_);
ownership_ = GeometryOwnershipType::Owned;
}
return curve_;
@@ -107,7 +107,7 @@ void CurveComponent::ensure_owns_direct_data()
{
BLI_assert(this->is_mutable());
if (ownership_ != GeometryOwnershipType::Owned) {
- curve_ = curve_->copy();
+ curve_ = new CurveEval(*curve_);
ownership_ = GeometryOwnershipType::Owned;
}
}