[Bf-blender-cvs] [a0741a4] soc-2014-shapekey: slightly less verbose version of previous work.

[Bastien Montagne]

Commit: a0741a473b212e4e7471c9127871f881404e6baf
Author: Bastien Montagne
Date:   Mon Oct 20 18:11:42 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rBa0741a473b212e4e7471c9127871f881404e6baf

slightly less verbose version of previous work.

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

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

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

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 27779e3..b40f735 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -2370,15 +2370,10 @@ bool BKE_keyblock_move(Object *ob, int org_index, int new_index)
 	/* We swap 'org' element with its previous/next neighbor (depending on direction of the move) repeatedly,
 	 * until we reach final position.
 	 * This allows us to only loop on the list once! */
-	if (rev) {
-		kb = key->block.last;
-		i = totkey - 1;
-	}
-	else {
-		kb = key->block.first;
-		i = 0;
-	}
-	while (kb) {
+	for (kb = (rev ? key->block.last : key->block.first), i = (rev ? totkey - 1 : 0);
+	     kb;
+	     kb = (rev ? kb->prev : kb->next), rev ? i-- : i++)
+	{
 		if (i == org_index) {
 			in_range = true;  /* Start list items swapping... */
 		}
@@ -2410,15 +2405,6 @@ bool BKE_keyblock_move(Object *ob, int org_index, int new_index)
 			/* remove before, insert after this index */
 			kb->relative--;
 		}
-
-		if (rev) {
-			kb = kb->prev;
-			i--;
-		}
-		else {
-			kb = kb->next;
-			i++;
-		}
 	}
 
 	/* Need to update active shape number if it's affected, same principle as for relative indices above. */