diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-03-02 03:55:10 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-03-02 03:55:10 +0300 |
| commit | d52212c73e12287c88036ba5e82a6cb647342012 (patch) | |
| tree | a8947605fb97c2ad58617e2fe4d6724a838618c0 /source/blender | |
| parent | 6888f540e8ebee25c94db67474c48dd7c249bdf9 (diff) | |
2.5 - Various animation bugfixes for samples
Diffstat (limited to 'source/blender')
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 1727ec17182..4b5ab6296b4 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -535,7 +535,7 @@ void fcurve_to_keylist(FCurve *fcu, ListBase *keys, ListBase *blocks, ActKeysInc ActKeyBlock *ab, *ab2; int v; - if (fcu && fcu->totvert) { + if (fcu && fcu->totvert && fcu->bezt) { /* loop through beztriples, making ActKeys and ActKeyBlocks */ bezt= fcu->bezt; diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index f02a9b6e6f4..1efa257c317 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -390,7 +390,7 @@ static void draw_fcurve_samples (SpaceIpo *sipo, ARegion *ar, FCurve *fcu) /* get verts */ first= fcu->fpt; - last= (first) ? (first + fcu->totvert) : (NULL); + last= (first) ? (first + (fcu->totvert-1)) : (NULL); /* draw */ if (first && last) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 3b2c1bfe495..587607f3eb8 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2748,7 +2748,7 @@ static int count_fcurve_keys(FCurve *fcu, char side, float cfra) BezTriple *bezt; int i, count = 0; - if (fcu == NULL) + if (ELEM(NULL, fcu, fcu->bezt)) return count; /* only include points that occur on the right side of cfra */ diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index f3fd9350710..d18b01ecc16 100755 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -139,11 +139,10 @@ static void rna_def_pose_channel(BlenderRNA *brna) prop= RNA_def_property(srna, "euler_rotation", PROP_FLOAT, PROP_ROTATION); RNA_def_property_float_sdna(prop, NULL, "eul"); - RNA_def_property_ui_text(prop, "Rotation", "Rotation in Eulers."); + RNA_def_property_ui_text(prop, "Rotation (Euler)", "Rotation in Eulers."); prop= RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rotmode"); - RNA_def_property_flag(prop, PROP_NOT_EDITABLE); RNA_def_property_enum_items(prop, prop_rotmode_items); RNA_def_property_ui_text(prop, "Rotation Mode", ""); |