Commit: 353900fcd57721332f22d14e0bec1d3305cbff66
Author: Sybren A. Stüvel
Date: Wed Apr 25 11:04:40 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB353900fcd57721332f22d14e0bec1d3305cbff66
Start porting Armature modifier
===================================================================
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 1e3921747a5..132cfcdcf8a 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -73,7 +73,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 DerivedMesh *dm, float (*vertexCos)[3],
+ 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 d1b02695c35..370d3c1ca2b 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, DerivedMesh *dm,
float (*vertexCos)[3],
+void armature_deform_verts(Object *armOb, Object *target, Mesh *mesh, float
(*vertexCos)[3],
float (*defMats)[3][3], int numVerts, int
deformflag,
float (*prevCos)[3], const char *defgrp_name)
{
@@ -1039,9 +1039,9 @@ void armature_deform_verts(Object *armOb, Object *target,
DerivedMesh *dm, float
/* get a vertex-deform-index to posechannel array */
if (deformflag & ARM_DEF_VGROUP) {
if (ELEM(target->type, OB_MESH, OB_LATTICE)) {
- /* if we have a DerivedMesh, only use dverts if it has
them */
- if (dm) {
- use_dverts = (dm->getVertDataArray(dm,
CD_MDEFORMVERT) != NULL);
+ /* if we have a Mesh, only use dverts if it has them */
+ if (mesh) {
+ use_dverts = (mesh->dvert != NULL);
}
else if (dverts) {
use_dverts = true;
@@ -1103,8 +1103,10 @@ void armature_deform_verts(Object *armOb, Object
*target, DerivedMesh *dm, float
}
if (use_dverts || armature_def_nr != -1) {
- if (dm)
- dvert = dm->getVertData(dm, i, CD_MDEFORMVERT);
+ if (mesh) {
+ BLI_assert(i < mesh->totvert);
+ dvert = mesh->dvert + i;
+ }
else if (dverts && i < target_totvert)
dvert = dverts + i;
else
diff --git a/source/blender/blenkernel/intern/modifier.c
b/source/blender/blenkernel/intern/modifier.c
index f7892e2f08b..f2f90c1ee52 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1054,6 +1054,7 @@ void modifier_deformVertsEM_DM_deprecated(struct
ModifierData *md, struct Depsgr
mti->deformVertsEM_DM(md, depsgraph, ob, editData, dm,
vertexCos, numVerts);
}
else {
+ /* 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);
diff --git a/source/blender/modifiers/intern/MOD_armature.c
b/source/blender/modifiers/intern/MOD_armature.c
index c448ebdf11f..bca61bfa589 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -46,6 +46,7 @@
#include "BKE_cdderivedmesh.h"
#include "BKE_lattice.h"
#include "BKE_library_query.h"
+#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "MEM_guardedalloc.h"
@@ -107,7 +108,7 @@ static void updateDepsgraph(ModifierData *md, const
ModifierUpdateDepsgraphConte
}
static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph),
- Object *ob, DerivedMesh *derivedData,
+ Object *ob, Mesh *mesh,
float (*vertexCos)[3],
int numVerts,
ModifierApplyFlag UNUSED(flag))
@@ -116,7 +117,7 @@ static void deformVerts(ModifierData *md, struct Depsgraph
*UNUSED(depsgraph),
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs
original vertices */
- armature_deform_verts(amd->object, ob, derivedData, vertexCos, NULL,
+ armature_deform_verts(amd->object, ob, mesh, vertexCos, NULL,
numVerts, amd->deformflag,
(float(*)[3])amd->prevCos, amd->defgrp_name);
/* free cache */
@@ -128,16 +129,16 @@ static void deformVerts(ModifierData *md, struct
Depsgraph *UNUSED(depsgraph),
static void deformVertsEM(
ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob,
struct BMEditMesh *em,
- DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
+ Mesh *mesh, float (*vertexCos)[3], int numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;
- DerivedMesh *dm = derivedData;
+ Mesh *to_use = mesh;
- if (!derivedData) dm = CDDM_from_editbmesh(em, false, false);
+// if (!mesh) to_use = Mesh_from_editbmesh(em, false, false);
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs
original vertices */
- armature_deform_verts(amd->object, ob, dm, vertexCos, NULL,
+ armature_deform_verts(amd->object, ob, mesh, vertexCos, NULL,
numVerts, amd->deformflag,
(float(*)[3])amd->prevCos, amd->defgrp_name);
/* free cache */
@@ -146,7 +147,10 @@ static void deformVertsEM(
amd->prevCos = NULL;
}
- if (!derivedData) dm->release(dm);
+// if (!mesh) {
+// BKE_mesh_free(to_use);
+// MEM_freeN(to_use);
+// }
}
static void deformMatricesEM(
@@ -190,14 +194,14 @@ ModifierTypeInfo modifierType_Armature = {
/* copyData */ copyData,
- /* deformVerts_DM */ deformVerts,
+ /* deformVerts_DM */ NULL,
/* deformMatrices_DM */ deformMatrices,
/* deformVertsEM_DM */ deformVertsEM,
/* deformMatricesEM_DM*/deformMatricesEM,
/* applyModifier_DM */ NULL,
/* applyModifierEM_DM */NULL,
- /* deformVerts */ NULL,
+ /* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
/* deformMatricesEM */ NULL,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
