archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Bastien Montagne
2018-06-13 16:29:12 +02:00
parent 5ff1d845ea
commit f61c30f804
20 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_edit.c
View File

@@ -365,7 +365,7 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
return false;
}
EDBM_mesh_load(obedit);
EDBM_mesh_load(bmain, obedit);
if (freedata) {
EDBM_mesh_free(me->edit_btmesh);

2
source/blender/editors/object/object_hook.c
View File

@@ -315,7 +315,7 @@ static bool object_hook_index_array(Main *bmain, Scene *scene, Object *obedit,
BMEditMesh *em;
EDBM_mesh_load(obedit);
EDBM_mesh_load(bmain, obedit);
EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
DAG_id_tag_update(obedit->data, 0);

2
source/blender/editors/object/object_relations.c
View File

@@ -139,7 +139,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
Mesh *me = obedit->data;
BMEditMesh *em;
EDBM_mesh_load(obedit);
EDBM_mesh_load(bmain, obedit);
EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
DAG_id_tag_update(obedit->data, 0);