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>2005-10-13 00:36:11 +0400
committerTon Roosendaal <ton@blender.org>2005-10-13 00:36:11 +0400
commit88f6295dc6d8a34d76965fd62dbe52777125adb0 (patch)
treeab85fabcbfe9ddb443b24e119e12bf2e075887af /source/blender/src/editipo.c
parentedad7a67b429ec3fd2de70bd0f957b0a945b5f01 (diff)
Two very easy crash fixes, one more proper pointer check, and a check
for a division by zero. Sorry... but i can't stand such known issues to be in an official build. :)
Diffstat (limited to 'source/blender/src/editipo.c')
-rw-r--r--source/blender/src/editipo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index d5eb4268367..fadf35529e6 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -885,7 +885,7 @@ static void make_editipo(void)
rf= &(G.sipo->ipo->cur);
if(rf->xmin<rf->xmax && rf->ymin<rf->ymax) G.v2d->cur= *rf;
-
+ else ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
}
else {
ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
@@ -932,7 +932,7 @@ static void get_ipo_context(short blocktype, ID **from, Ipo **ipo, char *actname
}
}
else if(blocktype==ID_PO) {
- if (ob && ob->action) {
+ if (ob && ob->action && ob->type==OB_ARMATURE) {
bPoseChannel *pchan= get_active_posechannel(ob);
*from= (ID *)ob;