blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release' into master

This commit is contained in:
Campbell Barton 2020-08-03 18:03:49 +10:00
parent 144f780c71 8f22feefbc
commit 040d7872e8
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,10 +165,15 @@ static void deformVerts(ModifierData *md,
static void deformVertsEM(ModifierData *md,
const ModifierEvalContext *ctx,
struct BMEditMesh *em,
Mesh *UNUSED(mesh),
Mesh *mesh,
float (*vertexCos)[3],
int numVerts)
{
if (mesh != NULL) {
deformVerts(md, ctx, mesh, vertexCos, numVerts);
return;
}
ArmatureModifierData *amd = (ArmatureModifierData *)md;
MOD_previous_vcos_store(md, vertexCos); /* if next modifier needs original vertices */

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

@ -150,10 +150,15 @@ static void deformVerts(ModifierData *md,
static void deformVertsEM(ModifierData *md,
const ModifierEvalContext *ctx,
BMEditMesh *em,
Mesh *UNUSED(mesh),
Mesh *mesh,
float (*vertexCos)[3],
int numVerts)
{
if (mesh != NULL) {
deformVerts(md, ctx, mesh, vertexCos, numVerts);
return;
}
CurveModifierData *cmd = (CurveModifierData *)md;
bool use_dverts = false;
int defgrp_index = -1;

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

@ -130,10 +130,15 @@ static void deformVerts(ModifierData *md,
static void deformVertsEM(ModifierData *md,
const ModifierEvalContext *ctx,
struct BMEditMesh *em,
struct Mesh *UNUSED(mesh),
struct Mesh *mesh,
float (*vertexCos)[3],
int numVerts)
{
if (mesh != NULL) {
deformVerts(md, ctx, mesh, vertexCos, numVerts);
return;
}
LatticeModifierData *lmd = (LatticeModifierData *)md;
MOD_previous_vcos_store(md, vertexCos); /* if next modifier needs original vertices */