[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34362] trunk/blender/source/blender/ editors/space_action/action_select.c: More consistency with order of action vs gp keyframes...

[Joshua Leung]

Revision: 34362
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34362
Author:   aligorith
Date:     2011-01-17 08:27:16 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
More consistency with order of action vs gp keyframes...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_action/action_select.c

Modified: trunk/blender/source/blender/editors/space_action/action_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_select.c	2011-01-17 08:21:13 UTC (rev 34361)
+++ trunk/blender/source/blender/editors/space_action/action_select.c	2011-01-17 08:27:16 UTC (rev 34362)
@@ -123,10 +123,10 @@
 	
 	/* Now set the flags */
 	for (ale= anim_data.first; ale; ale= ale->next) {
-		if (ale->type == ANIMTYPE_FCURVE)
-			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL);
-		else if (ale->type == ANIMTYPE_GPLAYER)
+		if (ale->type == ANIMTYPE_GPLAYER)
 			set_gplayer_frame_selection(ale->data, sel);
+		else
+			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL); 
 	}
 	
 	/* Cleanup */
@@ -255,7 +255,7 @@
 			/* loop over data selecting */
 			if (ale->type == ANIMTYPE_GPLAYER)
 				borderselect_gplayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
-			else (ale->type == ANIMTYPE_FCURVE)
+			else
 				ANIM_animchannel_keyframes_loop(&ked, ale, ok_cb, select_cb, NULL, filterflag);
 		}
 		
@@ -484,10 +484,10 @@
 				ked.f1= ce->cfra;
 			
 			/* select elements with frame number matching cfraelem */
-			if (ale->type == ANIMTYPE_FCURVE)
+			if (ale->type == ANIMTYPE_GPLAYER)
+				select_gpencil_frame(ale->data, ce->cfra, SELECT_ADD);
+			else
 				ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-			else if (ale->type == ANIMTYPE_GPLAYER)
-				select_gpencil_frame(ale->data, ce->cfra, SELECT_ADD);
 		}
 	}
 	
@@ -865,10 +865,10 @@
 			ked.f1= selx;
 		
 		/* select elements with frame number matching cfra */
-		if (ale->type == ANIMTYPE_FCURVE)
+		if (ale->type == ANIMTYPE_GPLAYER)
+			select_gpencil_frame(ale->key_data, selx, select_mode);
+		else 
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
-		else if (ale->type == ANIMTYPE_GPLAYER)
-			select_gpencil_frame(ale->key_data, selx, select_mode);
 	}
 	
 	/* free elements */