diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:59:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 17:02:53 +0300 |
| commit | 8f670dd855b1d81fcf619b3b94ba4bfaf51e896d (patch) | |
| tree | 681c0dabf0af6e17ead533d174fde08e55e9cd0f /source/blender/alembic | |
| parent | 9d037153f70c9bcc665fffa4971d1517044dbf29 (diff) | |
| parent | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_preview.c
source/blender/makesrna/intern/rna_object.c
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 56fa0a93532..d52d7f06048 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -667,7 +667,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string int matcount = 0; for (; it != mat_index_map.end(); ++it, ++matcount) { - if (!BKE_object_material_slot_add(ob)) { + if (!BKE_object_material_slot_add(bmain, ob)) { can_assign = false; break; } @@ -696,7 +696,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string assigned_mat = mat_iter->second; } - assign_material(ob, assigned_mat, it->second, BKE_MAT_ASSIGN_OBDATA); + assign_material(bmain, ob, assigned_mat, it->second, BKE_MAT_ASSIGN_OBDATA); } } } |