Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-13 17:29:12 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-13 17:29:12 +0300
commitf61c30f804e36bf00e7124514f02bbee42e0197d (patch)
tree0f947a35c7814cb15ce7cfa1b5a2c1eb01d910d7 /source/blender/bmesh/operators
parent5ff1d845ead05ac6ef952782ebd3ed98277ef6c5 (diff)
Cleanup: get rid of last G.main in BMesh code.
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r--source/blender/bmesh/operators/bmo_mesh_conv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 7311ed5ce64..cc1f45baf0c 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -38,6 +38,7 @@
#include "bmesh.h"
#include "intern/bmesh_operators_private.h"
+#include "BKE_global.h"
void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
{
@@ -72,7 +73,7 @@ void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op)
/* Object *ob = BMO_slot_ptr_get(op, "object"); */
BM_mesh_bm_to_me(
- bm, me,
+ G.main, bm, me,
(&(struct BMeshToMeshParams){
.calc_object_remap = true,
}));