From 572bc1364ca9d978edf5aee991849dd4f8e56a52 Mon Sep 17 00:00:00 2001
From: Julian Eisel <eiseljulian@gmail.com>
Date: Sun, 18 Sep 2016 21:36:34 +0200
Subject: BLI_listbase: Add/use utility to move link (BLI_listbase_link_move)

We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates.

Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed.

Also some minor cleanup.
---
 source/blender/editors/armature/pose_group.c | 51 +++++++++-------------------
 source/blender/editors/armature/pose_lib.c   | 34 ++++++-------------
 2 files changed, 26 insertions(+), 59 deletions(-)

(limited to 'source/blender/editors/armature')

diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c
index 85bee023cef..85cff2e4df5 100644
--- a/source/blender/editors/armature/pose_group.c
+++ b/source/blender/editors/armature/pose_group.c
@@ -306,50 +306,31 @@ static int group_move_exec(bContext *C, wmOperator *op)
 
 	/* move bone group */
 	grpIndexA = pose->active_group;
-	if (dir == 1) { /* up */
-		void *prev = grp->prev;
-		
-		if (prev == NULL)
-			return OPERATOR_FINISHED;
-			
-		BLI_remlink(&pose->agroups, grp);
-		BLI_insertlinkbefore(&pose->agroups, prev, grp);
-		
-		grpIndexB = grpIndexA - 1;
-		pose->active_group--;
-	}
-	else { /* down */
-		void *next = grp->next;
-		
-		if (next == NULL)
-			return OPERATOR_FINISHED;
-			
-		BLI_remlink(&pose->agroups, grp);
-		BLI_insertlinkafter(&pose->agroups, next, grp);
-		
-		grpIndexB = grpIndexA + 1;
-		pose->active_group++;
-	}
+	if (BLI_listbase_link_move(&pose->agroups, grp, dir)) {
+		grpIndexB = grpIndexA + dir;
+		pose->active_group += dir;
+		/* fix changed bone group indices in bones (swap grpIndexA with grpIndexB) */
+		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+			if (pchan->agrp_index == grpIndexB) {
+				pchan->agrp_index = grpIndexA;
+			}
+			else if (pchan->agrp_index == grpIndexA) {
+				pchan->agrp_index = grpIndexB;
+			}
+		}
 
-	/* fix changed bone group indices in bones (swap grpIndexA with grpIndexB) */
-	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-		if (pchan->agrp_index == grpIndexB)
-			pchan->agrp_index = grpIndexA;
-		else if (pchan->agrp_index == grpIndexA)
-			pchan->agrp_index = grpIndexB;
+		/* notifiers for updates */
+		WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
 	}
 
-	/* notifiers for updates */
-	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
-
 	return OPERATOR_FINISHED;
 }
 
 void POSE_OT_group_move(wmOperatorType *ot)
 {
 	static EnumPropertyItem group_slot_move[] = {
-		{1, "UP", 0, "Up", ""},
-		{-1, "DOWN", 0, "Down", ""},
+		{-1, "UP", 0, "Up", ""},
+		{1, "DOWN", 0, "Down", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index b200aa2401b..4af7f3f8727 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -766,32 +766,18 @@ static int poselib_move_exec(bContext *C, wmOperator *op)
 	dir = RNA_enum_get(op->ptr, "direction");
 
 	/* move pose */
-	if (dir == 1) { /* up */
-		void *prev = marker->prev;
+	if (BLI_listbase_link_move(&act->markers, marker, dir)) {
+		act->active_marker = marker_index + dir + 1;
 
-		if (prev == NULL)
-			return OPERATOR_CANCELLED;
-
-		BLI_remlink(&act->markers, marker);
-		BLI_insertlinkbefore(&act->markers, prev, marker);
+		/* send notifiers for this - using keyframe editing notifiers, since action
+		 * may be being shown in anim editors as active action
+		 */
+		WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 	}
-	else { /* down */
-		void *next = marker->next;
-
-		if (next == NULL)
-			return OPERATOR_CANCELLED;
-
-		BLI_remlink(&act->markers, marker);
-		BLI_insertlinkafter(&act->markers, next, marker);
+	else {
+		return OPERATOR_CANCELLED;
 	}
 
-	act->active_marker = marker_index - dir + 1;
-
-	/* send notifiers for this - using keyframe editing notifiers, since action
-	 * may be being shown in anim editors as active action
-	 */
-	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
-
 	/* done */
 	return OPERATOR_FINISHED;
 }
@@ -800,8 +786,8 @@ void POSELIB_OT_pose_move(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 	static EnumPropertyItem pose_lib_pose_move[] = {
-		{1, "UP", 0, "Up", ""},
-		{-1, "DOWN", 0, "Down", ""},
+		{-1, "UP", 0, "Up", ""},
+		{1, "DOWN", 0, "Down", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
-- 
cgit v1.2.3