[Bf-blender-cvs] [942039244ef] soc-2020-io-performance: Nurbs: remove depsgraph from class, minor cleanup.

[Ankit Meel]

Commit: 942039244ef09c79977e5df60b9e681bfe713383
Author: Ankit Meel
Date:   Mon Sep 21 13:31:07 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB942039244ef09c79977e5df60b9e681bfe713383

Nurbs: remove depsgraph from class, minor cleanup.

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

M	source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc
M	source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh

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

diff --git a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc
index 441c7e647eb..0faf9c017b1 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc
@@ -35,9 +35,9 @@ namespace blender::io::obj {
 OBJCurve::OBJCurve(Depsgraph *depsgraph,
                    const OBJExportParams &export_params,
                    Object *export_object)
-    : depsgraph_(depsgraph), export_object_eval_(export_object)
+    : export_object_eval_(export_object)
 {
-  export_object_eval_ = DEG_get_evaluated_object(depsgraph_, export_object);
+  export_object_eval_ = DEG_get_evaluated_object(depsgraph, export_object);
   export_curve_ = static_cast<Curve *>(export_object_eval_->data);
   set_world_axes_transform(export_params.forward_axis, export_params.up_axis);
 }
@@ -84,9 +84,8 @@ float3 OBJCurve::calc_nurbs_point_coords(const int index,
 {
   const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, index));
   float3 r_coord;
-  BPoint *bpoint = nurb->bp;
-  bpoint += vert_index;
-  copy_v3_v3(r_coord, bpoint->vec);
+  const BPoint &bpoint = nurb->bp[vert_index];
+  copy_v3_v3(r_coord, bpoint.vec);
   mul_m4_v3(world_axes_transform_, r_coord);
   mul_v3_fl(r_coord, scaling_factor);
   return r_coord;
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh b/source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh
index e63bc87145e..12b40067d67 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh
@@ -37,7 +37,6 @@ namespace blender::io::obj {
  */
 class OBJCurve : NonMovable, NonCopyable {
  private:
-  const Depsgraph *depsgraph_;
   const Object *export_object_eval_;
   const Curve *export_curve_;
   float world_axes_transform_[4][4];