From f7af08b5feecd89ea32c8905de1e61d575ff4bf1 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Tue, 29 May 2018 15:49:21 +0200
Subject: 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...
---
 source/blender/alembic/intern/abc_mesh.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/blender/alembic')

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);
 		}
 	}
 }
-- 
cgit v1.2.3