blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.3-release'

This commit is contained in:
Hans Goudey 2022-08-02 09:51:08 -05:00
parent 074ce49de0 d3eef4d22a
commit dadfdc8226
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
View File

@ -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;
}