From 6f8c29ab0b0b33bcb8fc75d47fc3f5eca8fc55cd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 9 May 2013 07:02:51 +0000 Subject: fix for 2 errors introduced since release - shape key NULL pointer dereference. - use uninitialized variable for bmesh free. also update credits and merge dissolve flag assignment. --- source/blender/editors/object/object_shapekey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/object/object_shapekey.c') diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 6fd2054637d..543b003f5a5 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -458,10 +458,10 @@ static int shape_key_move_exec(bContext *C, wmOperator *op) } SWAP(float, kb_other->pos, kb->pos); /* for absolute shape keys */ - } - /* First key is refkey, matches interface and BKE_key_sort */ - key->refkey = key->block.first; + /* First key is refkey, matches interface and BKE_key_sort */ + key->refkey = key->block.first; + } DAG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); -- cgit v1.2.3