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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-10 15:08:39 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-10 15:08:39 +0400
commitb1fb86cbe7d6ad66835ea09300e7c3a33c4e02d6 (patch)
treeeccd2ad2acba17d96e9b890074a7c0294e3a71b8
parent4aae3e3698570519389ba6f8f76bd748ce9808da (diff)
Fix bug in vertex group code after recent changes, did not do proper NULL
pointer check.
-rw-r--r--source/blender/editors/object/object_vgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 54ef65ab3fb..1089df2e00d 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -993,7 +993,7 @@ static float get_vert_def_nr(Object *ob, const int def_nr, const int vertnum)
EDBM_index_arrays_ensure(em, BM_VERT);
- if ((cd_dvert_offset != -1) || (eve = EDBM_vert_at_index(em, vertnum))) {
+ if ((cd_dvert_offset != -1) && (eve = EDBM_vert_at_index(em, vertnum))) {
dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
}
else {