Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-06-04 21:19:32 +0400
committerTon Roosendaal <ton@blender.org>2006-06-04 21:19:32 +0400
commit3a77069fe7de4a1ec31293f6d2112c5a992dbd44 (patch)
tree373e7aa8d4a59d1a81abf379e5876b842b312eb0 /source/blender/src/editipo_mods.c
parentd589afbac0538a347d3f524ee8171628e69636ea (diff)
Bug found by Campbell; Tkey in IpoWindow on "shape keys" didn't work at
all, and even crashed in some cases.
Diffstat (limited to 'source/blender/src/editipo_mods.c')
-rw-r--r--source/blender/src/editipo_mods.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/editipo_mods.c b/source/blender/src/editipo_mods.c
index be403953721..22bd0d55303 100644
--- a/source/blender/src/editipo_mods.c
+++ b/source/blender/src/editipo_mods.c
@@ -54,6 +54,7 @@
#include "BKE_global.h"
#include "BKE_ipo.h"
+#include "BKE_key.h"
#include "BKE_utildefines.h"
#include "BIF_interface.h"
@@ -693,12 +694,13 @@ void set_ipotype(void)
get_status_editipo();
if(G.sipo->blocktype==ID_KE && totipo_edit==0 && totipo_sel==0) {
- Key *key= (Key *)G.sipo->from;
+ Key *key= ob_get_key((Object *)G.sipo->from);
Object *ob= OBACT;
KeyBlock *kb;
if(key==NULL) return;
kb= BLI_findlink(&key->block, ob->shapenr-1);
+ if(kb==NULL) return;
event= pupmenu("Key Type %t|Linear %x1|Cardinal %x2|B Spline %x3");
if(event < 1) return;