diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-24 11:06:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-24 11:06:00 +0300 |
| commit | c013280eec2fa1e5431b3346fa342e9681b1c1a3 (patch) | |
| tree | 0708e5e79be6291a3fc3c2b0228cd8426c83429e /source | |
| parent | 1d13950ae544d532ed5a89b5fe4184c60214ee71 (diff) | |
Fix mistake in BKE_mesh_new_from_object handling of materials in MetaBall case.
Typo, spoted by Coverity scan.
To be backported to 2.78a.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 446aef9be65..d21f43ac484 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2389,7 +2389,7 @@ Mesh *BKE_mesh_new_from_object( /* are we an object material or data based? */ 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); } } |