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

WeightVG modifiers: Cleanup, add asserts to validate expected data status...

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-08 12:58:01 +02:00
parent 7d9f1a699a
commit c51b017a1a
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@@ -158,6 +158,8 @@ static Mesh *applyModifier(ModifierData *md,
const ModifierEvalContext *ctx, const ModifierEvalContext *ctx,
Mesh *mesh) Mesh *mesh)
{ {
BLI_assert(mesh != NULL);
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md; WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;

2
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@@ -204,6 +204,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{ {
BLI_assert(mesh != NULL);
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md; WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;

5
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@@ -41,6 +41,7 @@
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_curve.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_library.h" #include "BKE_library.h"
@@ -380,6 +381,8 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{ {
BLI_assert(mesh != NULL);
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md; WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;
MDeformWeight **dw, **tdw; MDeformWeight **dw, **tdw;
@@ -519,7 +522,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
Mesh *target_mesh = get_mesh_eval_for_modifier(obr, ctx->flag); Mesh *target_mesh = get_mesh_eval_for_modifier(obr, ctx->flag);
/* We must check that we do have a valid target_mesh! */ /* We must check that we do have a valid target_mesh! */
if (target_mesh) { if (target_mesh != NULL) {
SpaceTransform loc2trgt; SpaceTransform loc2trgt;
float *dists_v = use_trgt_verts ? MEM_malloc_arrayN(numIdx, sizeof(float), "dists_v") : NULL; float *dists_v = use_trgt_verts ? MEM_malloc_arrayN(numIdx, sizeof(float), "dists_v") : NULL;
float *dists_e = use_trgt_edges ? MEM_malloc_arrayN(numIdx, sizeof(float), "dists_e") : NULL; float *dists_e = use_trgt_edges ? MEM_malloc_arrayN(numIdx, sizeof(float), "dists_e") : NULL;