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:
authorJoshua Leung <aligorith@gmail.com>2011-03-13 12:27:28 +0300
committerJoshua Leung <aligorith@gmail.com>2011-03-13 12:27:28 +0300
commit0c734577f40415b36e85598bee56f7079b8a3fef (patch)
tree89770ba2021bcb8e7138a1a7a0e0a18c5db96115 /source/blender/editors
parent42c2654d0e77dfe2df0cac04c848d2d3935db139 (diff)
Bugfix [#26484] delete keyframe in pose mode --> segmentation fault
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyframing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 125c8bbc55a..05fbab78039 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1332,7 +1332,7 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op)
short success= 0;
/* loop through all curves in animdata and delete keys on this frame */
- if (ob->adt) {
+ if ((ob->adt) && (ob->adt->action)) {
AnimData *adt= ob->adt;
bAction *act= adt->action;
@@ -1342,7 +1342,7 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op)
}
}
- BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully removed %d keyframes \n", id->name+2, success);
+ BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully had %d keyframes removed", id->name+2, success);
ob->recalc |= OB_RECALC_OB;
}