Commit: 597dbc38dd55bc9132df164bf3d87e7b1bcf34db
Author: Sybren A. Stüvel
Date: Wed Apr 25 11:44:19 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB597dbc38dd55bc9132df164bf3d87e7b1bcf34db
Ported armature modifier
The mesh parameter of armature_deform_verts() is now const, to indicate
that it's safe to pass ob->data to it directly.
===================================================================
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/modifiers/intern/MOD_armature.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_lattice.h
b/source/blender/blenkernel/BKE_lattice.h
index 132cfcdcf8a..37f838a543c 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -38,6 +38,7 @@
struct Lattice;
struct Main;
+struct Mesh;
struct Object;
struct Scene;
struct DerivedMesh;
@@ -73,7 +74,7 @@ void lattice_deform_verts(struct Object *laOb, struct Object
*target,
struct DerivedMesh *dm, float (*vertexCos)[3],
int numVerts, const char *vgroup, float influence);
void armature_deform_verts(struct Object *armOb, struct Object *target,
- struct Mesh *mesh, float (*vertexCos)[3],
+ const struct Mesh *mesh, float (*vertexCos)[3],
float (*defMats)[3][3], int numVerts, int
deformflag,
float (*prevCos)[3], const char *defgrp_name);
diff --git a/source/blender/blenkernel/intern/armature.c
b/source/blender/blenkernel/intern/armature.c
index 370d3c1ca2b..2ded32b3ec9 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -963,7 +963,7 @@ static void armature_bbone_defmats_cb(void *userdata, Link
*iter, int index)
}
}
-void armature_deform_verts(Object *armOb, Object *target, Mesh *mesh, float
(*vertexCos)[3],
+void armature_deform_verts(Object *armOb, Object *target, const Mesh * mesh,
float (*vertexCos)[3],
float (*defMats)[3][3], int numVerts, int
deformflag,
float (*prevCos)[3], const char *defgrp_name)
{
diff --git a/source/blender/blenkernel/intern/modifier.c
b/source/blender/blenkernel/intern/modifier.c
index f2f90c1ee52..3caa3a032ff 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1033,14 +1033,20 @@ void modifier_deformMatrices_DM_deprecated(struct
ModifierData *md, struct Depsg
mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos,
defMats, numVerts);
}
else {
- struct Mesh mesh;
- BKE_mesh_init(&mesh);
-
- DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+ /* TODO(sybren): deduplicate all the copies of this code in
this file. */
+ Mesh *mesh = NULL;
+ if (dm != NULL) {
+ mesh = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(mesh);
+ DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+ }
- mti->deformMatrices(md, depsgraph, ob, &mesh, vertexCos,
defMats, numVerts);
+ mti->deformMatrices(md, depsgraph, ob, mesh, vertexCos,
defMats, numVerts);
- BKE_mesh_free(&mesh);
+ if (mesh != NULL) {
+ BKE_mesh_free(mesh);
+ MEM_freeN(mesh);
+ }
}
}
@@ -1081,14 +1087,20 @@ void modifier_deformMatricesEM_DM_deprecated(struct
ModifierData *md, struct Dep
mti->deformMatricesEM_DM(md, depsgraph, ob, editData, dm,
vertexCos, defMats, numVerts);
}
else {
- struct Mesh mesh;
- BKE_mesh_init(&mesh);
-
- DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+ /* TODO(sybren): deduplicate all the copies of this code in
this file. */
+ Mesh *mesh = NULL;
+ if (dm != NULL) {
+ mesh = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(mesh);
+ DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+ }
- mti->deformMatricesEM(md, depsgraph, ob, editData, &mesh,
vertexCos, defMats, numVerts);
+ mti->deformMatricesEM(md, depsgraph, ob, editData, mesh,
vertexCos, defMats, numVerts);
- BKE_mesh_free(&mesh);
+ if (mesh != NULL) {
+ BKE_mesh_free(mesh);
+ MEM_freeN(mesh);
+ }
}
}
@@ -1141,19 +1153,30 @@ struct DerivedMesh
*modifier_applyModifierEM_DM_deprecated(struct ModifierData *
return mti->applyModifierEM_DM(md, depsgraph, ob, editData, dm,
flag);
}
else {
- struct Mesh mesh;
- BKE_mesh_init(&mesh);
-
- DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+ /* TODO(sybren): deduplicate all the copies of this code in
this file. */
+ Mesh *mesh = NULL;
+ if (dm != NULL) {
+ mesh = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(mesh);
+ DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+ }
- struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob,
editData, &mesh, flag);
+ struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob,
editData, mesh, flag);
DerivedMesh *ndm = CDDM_from_mesh(new_mesh);
+ if(new_mesh != mesh) {
+ /* Make a DM that doesn't reference new_mesh so we can
free the latter. */
+ /* TODO(sybren): create CDDM_from_mesh_ex() that
creates a copy directly. */
+ DerivedMesh *nonref_dm = CDDM_copy(ndm);
+ ndm->release(ndm);
+ ndm = nonref_dm;
- if(new_mesh != &mesh) {
- BKE_mesh_free(&mesh);
-
- /* XXX free new_mesh? */
+ BKE_mesh_free(new_mesh);
+ MEM_freeN(new_mesh);
+ }
+ if (mesh != NULL) {
+ BKE_mesh_free(mesh);
+ MEM_freeN(mesh);
}
return ndm;
diff --git a/source/blender/modifiers/intern/MOD_armature.c
b/source/blender/modifiers/intern/MOD_armature.c
index bca61bfa589..086e72b9278 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -42,13 +42,16 @@
#include "BLI_utildefines.h"
#include "BLI_string.h"
-
-#include "BKE_cdderivedmesh.h"
+#include "BKE_editmesh.h"
#include "BKE_lattice.h"
+#include "BKE_library.h"
#include "BKE_library_query.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
+#include "bmesh.h"
+#include "bmesh_tools.h"
+
#include "MEM_guardedalloc.h"
#include "MOD_util.h"
@@ -134,11 +137,17 @@ static void deformVertsEM(
ArmatureModifierData *amd = (ArmatureModifierData *) md;
Mesh *to_use = mesh;
-// if (!mesh) to_use = Mesh_from_editbmesh(em, false, false);
+ /* TODO(sybren): possibly lift this code to modifier.c and use it for
all modifiers */
+ if (!mesh) {
+ struct BMeshToMeshParams params = {0};
+ to_use = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(to_use);
+ BM_mesh_bm_to_me(em->bm, to_use, ¶ms);
+ }
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs
original vertices */
- armature_deform_verts(amd->object, ob, mesh, vertexCos, NULL,
+ armature_deform_verts(amd->object, ob, to_use, vertexCos, NULL,
numVerts, amd->deformflag,
(float(*)[3])amd->prevCos, amd->defgrp_name);
/* free cache */
@@ -147,40 +156,45 @@ static void deformVertsEM(
amd->prevCos = NULL;
}
-// if (!mesh) {
-// BKE_mesh_free(to_use);
-// MEM_freeN(to_use);
-// }
+ if (!mesh) {
+ BKE_mesh_free(to_use);
+ MEM_freeN(to_use);
+ }
}
static void deformMatricesEM(
ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob,
struct BMEditMesh *em,
- DerivedMesh *derivedData, float (*vertexCos)[3],
+ Mesh *mesh, float (*vertexCos)[3],
float (*defMats)[3][3], int numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;
- DerivedMesh *dm = derivedData;
+ Mesh *to_use = mesh;
- if (!derivedData) dm = CDDM_from_editbmesh(em, false, false);
+ /* TODO(sybren): possibly lift this code to modifier.c and use it for
all modifiers */
+ if (!mesh) {
+ struct BMeshToMeshParams params = {0};
+ to_use = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(to_use);
+ BM_mesh_bm_to_me(em->bm, to_use, ¶ms);
+ }
- armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts,
+ armature_deform_verts(amd->object, ob, to_use, vertexCos, defMats,
numVerts,
amd->deformflag, NULL, amd->defgrp_name);
- if (!derivedData) dm->release(dm);
+ if (!mesh) {
+ BKE_mesh_free(to_use);
+ MEM_freeN(to_use);
+ }
}
-static void deformMatrices(ModifierData *md, struct Depsgraph
*UNUSED(depsgraph), Object *ob, DerivedMesh *derivedData,
+static void deformMatrices(ModifierData *md, struct Depsgraph
*UNUSED(depsgraph), Object *ob, Mesh *mesh,
float (*vertexCos)[3], float (*defMats)[3][3], int
numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;
- DerivedMesh *dm = derivedData;
+ Mesh *to_use = mesh ? mesh : ob->data;
- if (!derivedData) dm = CDDM_from_mesh((Mesh *)ob->data);
-
- armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts,
+ armature_deform_verts(amd->object, ob, to_use, vertexCos, defMats,
numVerts,
amd->deformflag, NULL, amd->defgrp_name);
-
- if (!derivedData) dm->release(dm);
}
ModifierTypeInfo modifierType_Armature = {
@@ -195,16 +209,16 @@ ModifierTypeInfo modifierType_Armature = {
/* copyData */ copyData,
/* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ deformMatrices,
- /* deformVertsEM_DM */ deformVertsEM,
- /* deformMatricesEM_DM*/deformMatricesEM,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
/* applyModifier_DM */ NULL,
/* applyModifierEM_DM */NULL,
/* deformVerts */ deformVerts,
- /* deformMatrices */ NULL,
- /* deformVertsEM */ NULL,
- /* deformMatricesEM */ NULL,
+ /* deformMatrices */ deformMatrices,
+ /* deformVertsEM */ deformVertsEM,
+ /* deformMatricesEM */ deformMatricesEM,
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
