Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2009-06-14 02:23:24 +0400
committerKent Mein <mein@cs.umn.edu>2009-06-14 02:23:24 +0400
commit472239cc948443e8265fc6359834225214ae03c5 (patch)
tree960c383aab52bb9efb76033b7b97a3119c6b444f /source
parenta7ac260cc5e47bfca6e9678f1271fbdd438ac119 (diff)
coverity issue CID: 307
Checker: FORWARD_NULL (help) File: base/src/source/blender/blenkernel/intern/modifier.c Function: meshdeformModifier_deformVerts Description: Variable "dm" tracked as NULL was passed to a function that dereferences it. fix provided by Brecht. Kent
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/modifier.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 2c4528f641e..29930b3eb58 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -7813,10 +7813,12 @@ static void meshdeformModifier_deformVerts(
{
DerivedMesh *dm;
- if(!derivedData && ob->type==OB_MESH)
- dm= CDDM_from_mesh(ob->data, ob);
- else
- dm= derivedData;
+ if (!derivedData) {
+ dm= get_original_dm(ob, NULL, 0);
+ if (dm == NULL) return;
+ }
+ else dm= derivedData;
+
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */