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

Some cleanup in modifiers' mesh copying.

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-14 14:34:00 +02:00
parent eabfd031fa
commit e5b53fb28c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -119,7 +119,12 @@ static Mesh *get_quick_mesh(
result = mesh_self; result = mesh_self;
} }
else { else {
BKE_id_copy_ex(NULL, &mesh_other->id, (ID **)&result, LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG, false); BKE_id_copy_ex(NULL, &mesh_other->id, (ID **)&result,
LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG |
LIB_ID_COPY_NO_PREVIEW,
false);
float imat[4][4]; float imat[4][4];
float omat[4][4]; float omat[4][4];

8
source/blender/modifiers/intern/MOD_util.c
View File

@@ -300,8 +300,9 @@ Mesh *get_mesh(
/* pass */ /* pass */
} }
else if (ob->type == OB_MESH) { else if (ob->type == OB_MESH) {
struct BMeshToMeshParams bmtmp = {0}; if (em) {
if (em) mesh = BKE_bmesh_to_mesh_nomain(em->bm, &bmtmp); mesh = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
}
else { else {
/* TODO(sybren): after modifier conversion of DM to Mesh is done, check whether /* TODO(sybren): after modifier conversion of DM to Mesh is done, check whether
* we really need a copy here. Maybe the CoW ob->data can be directly used. */ * we really need a copy here. Maybe the CoW ob->data can be directly used. */
@@ -309,7 +310,8 @@ Mesh *get_mesh(
NULL, ob->data, (ID **)&mesh, NULL, ob->data, (ID **)&mesh,
LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG, LIB_ID_CREATE_NO_DEG_TAG |
LIB_ID_COPY_NO_PREVIEW,
false); false);
} }