diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-17 16:59:25 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-17 16:59:25 +0300 |
| commit | 97a50e78ca88b4ffe180bc6567e5ed0358239efe (patch) | |
| tree | ffab68b5257d81b5fd7bc9aad6bdb6922e58c0c9 /source/blender/makesrna/intern/rna_action.c | |
| parent | 8f4d98283d3a4d6e23e9024e95974486015170d1 (diff) | |
| parent | 80d1d624d378d4d8c03fb26ef286baf5479b6497 (diff) | |
Merge branch 'master' into alembic_pointcache
Conflicts:
CMakeLists.txt
source/blender/blenkernel/intern/rigidbody.c
source/blender/makesrna/intern/rna_object_force.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_action.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 4cac5d413ea..8d7a05896a3 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -197,7 +197,7 @@ static void rna_Action_active_pose_marker_index_range(PointerRNA *ptr, int *min, bAction *act = (bAction *)ptr->data; *min = 0; - *max = max_ii(0, BLI_countlist(&act->markers) - 1); + *max = max_ii(0, BLI_listbase_count(&act->markers) - 1); } |