diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:49:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:49:21 +0300 |
| commit | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (patch) | |
| tree | b23f8e58157285ce3c6287f664f66bfcba85a69d /source/blender/alembic | |
| parent | c72a204001ae32ab082af66b373ce19b64e28e2d (diff) | |
Cleanup: Get rid of G.main in BKE_material.
Note that in some cases, this only moves the G.main case to somne other
places - in particular, RNA getters/setters are becoming annoying here...
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 ef0a823ac3e..a2903f7c3d1 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); } } } |