Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / mesh / mesh_data.c
index d2410c7..46b84f3 100644 (file)
@@ -538,6 +538,7 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot)
 
 static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
+       Main *bmain = CTX_data_main(C);
        Scene *scene = CTX_data_scene(C);
        View3D *v3d = CTX_wm_view3d(C);
        Base *base;
@@ -578,7 +579,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *e
                return OPERATOR_CANCELLED;
 
        if (exitmode) {
-               EDBM_mesh_load(obedit);
+               EDBM_mesh_load(bmain, obedit);
                EDBM_mesh_free(me->edit_btmesh);
                MEM_freeN(me->edit_btmesh);
                me->edit_btmesh = NULL;