archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix mistake in BKE_mesh_new_from_object handling of materials in MetaBall case.

Browse Source 
Typo, spoted by Coverity scan.

To be backported to 2.78a.
This commit is contained in:
Bastien Montagne
2016-10-24 10:06:00 +02:00
parent 1d13950ae5
commit c013280eec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/mesh.c
View File

@@ -2389,7 +2389,7 @@ Mesh *BKE_mesh_new_from_object(
/* are we an object material or data based? */ /* are we an object material or data based? */
tmpmesh->mat[i] = give_current_material(ob, i + 1); tmpmesh->mat[i] = give_current_material(ob, i + 1);
if (((ob->matbits[i] && ob->matbits) || do_mat_id_data_us) && tmpmesh->mat[i]) { if (((ob->matbits && ob->matbits[i]) || do_mat_id_data_us) && tmpmesh->mat[i]) {
id_us_plus(&tmpmesh->mat[i]->id); id_us_plus(&tmpmesh->mat[i]->id);
} }
} }