diff options
author | Hans Goudey <h.goudey@me.com> | 2022-08-02 17:49:51 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-08-02 17:49:51 +0300 |
commit | d3eef4d22a021bf71c5e6cac492139cab397e4d2 (patch) | |
tree | 0e9f556d038fdc8dca8ee075b6727d9193c00384 /source/blender/io/wavefront_obj | |
parent | e4dd644d6be04b6479d4a9f845e7d1ba43ceb332 (diff) |
Fix: Use evaluated materials in OBJ exporter
Since 1a81d268a19f2f140, materials on object data can change during
evaluation. But a different function is necessary to retrieve materials
taking that into account.
Solves part of T96721.
Differential Revision: https://developer.blender.org/D15595
Diffstat (limited to 'source/blender/io/wavefront_obj')
-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; } |