From bc124747f78bdc51c5b5d7c236ed44258c2c78d0 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 13 May 2006 13:39:40 +0000 Subject: [PATCH] Fix 4190 Using the "RVK" sliders in Action window, on a Library-linked Mesh, crashed due to using a NULL pointer. Added menu warning. --- source/blender/src/editkey.c | 37 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c index 60f9cc14e3f..fb1c3a50f7a 100644 --- a/source/blender/src/editkey.c +++ b/source/blender/src/editkey.c @@ -169,26 +169,27 @@ static void rvk_slider_func(void *voidob, void *voidkeynum) * for this frame */ bezt = get_bezt_icu_time(icu, &cfra, &rvkval); - } - /* create the bezier triple if one doesn't exist, - * otherwise modify it's value - */ - if (!bezt) { - insert_vert_ipo(icu, cfra, meshslidervals[keynum]); - } - else { - bezt->vec[1][1] = meshslidervals[keynum]; - } + /* create the bezier triple if one doesn't exist, + * otherwise modify it's value + */ + if (!bezt) { + insert_vert_ipo(icu, cfra, meshslidervals[keynum]); + } + else { + bezt->vec[1][1] = meshslidervals[keynum]; + } - /* make sure the Ipo's are properly process and - * redraw as necessary - */ - sort_time_ipocurve(icu); - testhandles_ipocurve(icu); - - ob->shapeflag &= ~OB_SHAPE_TEMPLOCK; - DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); + /* make sure the Ipo's are properly process and + * redraw as necessary + */ + sort_time_ipocurve(icu); + testhandles_ipocurve(icu); + + ob->shapeflag &= ~OB_SHAPE_TEMPLOCK; + DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); + } + else error("Cannot edit this Shape Key"); allqueue (REDRAWVIEW3D, 0); allqueue (REDRAWACTION, 0);