diff options
author | Ton Roosendaal <ton@blender.org> | 2006-05-13 17:39:40 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-05-13 17:39:40 +0400 |
commit | bc124747f78bdc51c5b5d7c236ed44258c2c78d0 (patch) | |
tree | bf6568b31b73f7647cc774ddbd581b68d058e8d5 /source/blender/src/editkey.c | |
parent | b0c5df16f61f16ca27ce298f328e13ef9c5df504 (diff) |
Fix 4190
Using the "RVK" sliders in Action window, on a Library-linked Mesh, crashed
due to using a NULL pointer. Added menu warning.
Diffstat (limited to 'source/blender/src/editkey.c')
-rw-r--r-- | source/blender/src/editkey.c | 37 |
1 files 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); |