From b1fb86cbe7d6ad66835ea09300e7c3a33c4e02d6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 10 Jun 2013 11:08:39 +0000 Subject: Fix bug in vertex group code after recent changes, did not do proper NULL pointer check. --- source/blender/editors/object/object_vgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3