[Bf-blender-cvs] [e77f3d92eee] curve-nodes-modifier: Merge branch 'master' into curve-nodes-modifier

[Hans Goudey]

Commit: e77f3d92eee2814fb19c5cb4b2b8a531bd3c25f2
Author: Hans Goudey
Date:   Mon Jun 28 22:23:57 2021 -0500
Branches: curve-nodes-modifier
https://developer.blender.org/rBe77f3d92eee2814fb19c5cb4b2b8a531bd3c25f2

Merge branch 'master' into curve-nodes-modifier

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



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

diff --cc source/blender/blenkernel/intern/displist.cc
index 719a8900aa9,7f4db0be34e..c0defc6e775
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@@ -1286,10 -1412,11 +1286,10 @@@ static void evaluate_curve_type_object(
      BKE_vfont_to_curve_nubase(ob, FO_EDIT, deformed_nurbs);
    }
    else {
-     BKE_nurbList_duplicate(deformed_nurbs, BKE_curve_nurbs_get(const_cast<Curve *>(cu)));
+     BKE_nurbList_duplicate(deformed_nurbs, BKE_curve_nurbs_get_for_read(cu));
    }
  
 -  bool force_mesh_conversion = BKE_curve_calc_modifiers_pre(
 -      depsgraph, scene, ob, deformed_nurbs, deformed_nurbs, for_render);
 +  BKE_curve_calc_modifiers_pre(depsgraph, scene, ob, deformed_nurbs, deformed_nurbs, for_render);
  
    BKE_curve_bevelList_make(ob, deformed_nurbs, for_render);