From 8e73b770d4e9da71fb727444611657732cc52047 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 7 Jan 2015 02:02:55 +1100 Subject: Remove slurph shape-key feature This is an old option which wasn't working in over a year without complaint. --- source/blender/makesrna/intern/rna_key.c | 7 ------- source/blender/makesrna/intern/rna_object_api.c | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 7d10511d1c4..8a3626de81d 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -675,13 +675,6 @@ static void rna_def_key(BlenderRNA *brna) RNA_def_property_range(prop, MINFRAME, MAXFRAME); RNA_def_property_ui_text(prop, "Evaluation Time", "Evaluation time for absolute shape keys"); RNA_def_property_update(prop, 0, "rna_Key_update_data"); - - prop = RNA_def_property(srna, "slurph", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_sdna(prop, NULL, "slurph"); - RNA_def_property_range(prop, -500, 500); - RNA_def_property_ui_text(prop, "Slurph", - "Create a delay (in frames) in applying key positions, first vertex goes first"); - RNA_def_property_update(prop, 0, "rna_Key_update_data"); } void RNA_def_key(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 3dc75ef83f6..fa356ed43d0 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -225,10 +225,9 @@ static void rna_Object_free_duplilist(Object *ob) static PointerRNA rna_Object_shape_key_add(Object *ob, bContext *C, ReportList *reports, const char *name, int from_mix) { - Scene *scene = CTX_data_scene(C); KeyBlock *kb = NULL; - if ((kb = BKE_object_insert_shape_key(scene, ob, name, from_mix))) { + if ((kb = BKE_object_insert_shape_key(ob, name, from_mix))) { PointerRNA keyptr; RNA_pointer_create((ID *)ob->data, &RNA_ShapeKey, kb, &keyptr); -- cgit v1.2.3