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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-05-31 16:06:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-05-31 16:07:15 +0300
commit72a563cdee8fef198a200ff65b57ddb847c01795 (patch)
treef5404966b5a23c96178d04ff85f6831969c4c68c /source/blender/python/bmesh
parentd8dbd49a2f23b7637f05fc058f39bdf6ab706624 (diff)
Fix bmesh_to_mesh freeing possibly referenced vertices
Fixes Godot exporter issue reported in T65285.
Diffstat (limited to 'source/blender/python/bmesh')
-rw-r--r--source/blender/python/bmesh/bmesh_py_types.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index eb611e6566a..89d15edb0bd 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -31,6 +31,7 @@
#include "BKE_customdata.h"
#include "BKE_global.h"
#include "BKE_library.h"
+#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "DEG_depsgraph.h"
@@ -1089,13 +1090,19 @@ static PyObject *bpy_bmesh_to_mesh(BPy_BMesh *self, PyObject *args)
bm = self->bm;
- BLI_assert(BKE_id_is_in_global_main(&me->id));
- BM_mesh_bm_to_me(G_MAIN, /* XXX UGLY! */
- bm,
- me,
- (&(struct BMeshToMeshParams){
- .calc_object_remap = true,
- }));
+ struct Main *bmain = NULL;
+ struct BMeshToMeshParams params = {0};
+ if (me->id.tag & LIB_TAG_NO_MAIN) {
+ /* Mesh might be coming from a self-contained source like object.to_mesh(). No need to remap
+ * anything in this case. */
+ }
+ else {
+ BLI_assert(BKE_id_is_in_global_main(&me->id));
+ bmain = G_MAIN; /* XXX UGLY! */
+ params.calc_object_remap = true;
+ }
+
+ BM_mesh_bm_to_me(bmain, bm, me, &params);
/* we could have the user do this but if they forget blender can easy crash
* since the references arrays for the objects derived meshes are now invalid */