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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-08-07 15:13:56 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-08-07 15:13:56 +0400
commit820ced18b980aac1f97278094fb5842c580afbc7 (patch)
tree4987fa64aaecff51b679022c878caeadc480a2a9 /source/blender/makesrna/intern/rna_action.c
parentabc2e3efd161240476e60ca72e4d1b9e73023241 (diff)
parent38280ba38ed48d45e782e989a32b33510432d172 (diff)
Merged changes in the trunk up to revision 39117.
Diffstat (limited to 'source/blender/makesrna/intern/rna_action.c')
-rw-r--r--source/blender/makesrna/intern/rna_action.c5
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 d4d45db6db9..906748eaeb9 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);
}