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_pose.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_pose.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index f9d0e86183e..f72f97b1681 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -421,7 +421,7 @@ static void rna_PoseChannel_bone_group_index_range(PointerRNA *ptr, int *min, in bPose *pose = (ob) ? ob->pose : NULL; *min = 0; - *max = pose ? max_ii(0, BLI_countlist(&pose->agroups) - 1) : 0; + *max = pose ? max_ii(0, BLI_listbase_count(&pose->agroups) - 1) : 0; } static PointerRNA rna_Pose_active_bone_group_get(PointerRNA *ptr) @@ -454,7 +454,7 @@ static void rna_Pose_active_bone_group_index_range(PointerRNA *ptr, int *min, in bPose *pose = (bPose *)ptr->data; *min = 0; - *max = max_ii(0, BLI_countlist(&pose->agroups) - 1); + *max = max_ii(0, BLI_listbase_count(&pose->agroups) - 1); } #if 0 |