diff options
author | Hans Goudey <h.goudey@me.com> | 2022-08-02 17:51:08 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-08-02 17:51:08 +0300 |
commit | dadfdc822673ec9857e616759892b66a2ed6d8b3 (patch) | |
tree | 26b365b8f2b6cf10067a5cbaf5fc80b32212a1f4 | |
parent | 074ce49de014641f05f12e3b196d8eb7c4d1f733 (diff) | |
parent | d3eef4d22a021bf71c5e6cac492139cab397e4d2 (diff) |
Merge branch 'blender-v3.3-release'
-rw-r--r-- | source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index e2ecda32717..9460746630d 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -219,13 +219,13 @@ void OBJMesh::calc_poly_order() const Material *OBJMesh::get_object_material(const int16_t mat_nr) const { /** - * The const_cast is safe here because BKE_object_material_get won't change the object + * The const_cast is safe here because #BKE_object_material_get_eval won't change the object * but it is a big can of worms to fix the declaration of that function right now. * * The call uses "+ 1" as material getter needs one-based indices. */ Object *obj = const_cast<Object *>(&export_object_eval_); - const Material *r_mat = BKE_object_material_get(obj, mat_nr + 1); + const Material *r_mat = BKE_object_material_get_eval(obj, mat_nr + 1); return r_mat; } |