[Bf-blender-cvs] [e40387b] master: Keep proper bone active group after removing first one

[Sergey Sharybin]

Commit: e40387b1e2af2b2810b2062b1c68491c22911505
Author: Sergey Sharybin
Date:   Fri Jan 23 16:59:16 2015 +0500
Branches: master
https://developer.blender.org/rBe40387b1e2af2b2810b2062b1c68491c22911505

Keep proper bone active group after removing first one

Previously active bone group would be set to NONE after removing the first
one even if there are more groups in the armature.

===================================================================

M	source/blender/blenkernel/intern/action.c

===================================================================

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index f94f1e7..1bae65a 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1002,8 +1002,12 @@ void BKE_pose_remove_group(bPose *pose, bActionGroup *grp, const int index)
 	/* now, remove it from the pose */
 	BLI_freelinkN(&pose->agroups, grp);
 	if (pose->active_group >= idx) {
+		const bool has_groups = !BLI_listbase_is_empty(&pose->agroups);
 		pose->active_group--;
-		if (pose->active_group < 0 || BLI_listbase_is_empty(&pose->agroups)) {
+		if (pose->active_group == 0 && has_groups) {
+			pose->active_group = 1;
+		}
+		else if (pose->active_group < 0 || !has_groups) {
 			pose->active_group = 0;
 		}
 	}