diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
| commit | 4e8e502c0267faa68ce686df51cfb061d73ae93e (patch) | |
| tree | bf68517c1b537247b52b34d206cc640dc7280b31 /source/blender/makesrna/intern/rna_action.c | |
| parent | f5cff8ad37edbb46f155e768a07ff6785938f1b9 (diff) | |
| parent | de0db6c8daaf4f6276b43bd4c78d623fdb0eafb9 (diff) | |
Merging trunk up to r38932.
Diffstat (limited to 'source/blender/makesrna/intern/rna_action.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 31a9d57bc93..25c08a57889 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -191,8 +191,9 @@ static void rna_Action_active_pose_marker_index_range(PointerRNA *ptr, int *min, static void rna_Action_frame_range_get(PointerRNA *ptr,float *values) -{ - calc_action_range(ptr->id.data, values, values+1, 1); +{ /* don't include modifiers because they too easily can have very large + * ranges: MINAFRAMEF to MAXFRAMEF. */ + calc_action_range(ptr->id.data, values, values+1, FALSE); } |