2.5 - Various animation bugfixes for samples

This commit is contained in:
Joshua Leung
2009-03-02 00:55:10 +00:00
parent 6888f540e8
commit d52212c73e
4 changed files with 4 additions and 5 deletions

View File

@@ -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;

View File

@@ -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) {

View File

@@ -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 */

View File

@@ -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", "");