Cleanup: get rid of last G.main in BMesh code.

2018-06-13 16:29:12 +02:00
parent 5ff1d845ea
commit f61c30f804
20 changed files with 47 additions and 34 deletions
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -273,7 +273,7 @@ static void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA
 		/* exit/enter editmode to get new shape */
 		switch (ob->type) {
 			case OB_MESH:
-				EDBM_mesh_load(ob);
+				EDBM_mesh_load(bmain, ob);
 				EDBM_mesh_make(ob, scene->toolsettings->selectmode, true);

 				DAG_id_tag_update(ob->data, 0);