[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12952] trunk/blender/source/blender: == Action Editor - Show Hidden Channels ==

Joshua Leung aligorith at gmail.com
Thu Dec 20 00:29:43 CET 2007


Revision: 12952
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12952
Author:   aligorith
Date:     2007-12-20 00:29:42 +0100 (Thu, 20 Dec 2007)

Log Message:
-----------
== Action Editor - Show Hidden Channels ==

This option (found in the View menu) shows all Action Channels, regardless of whether the data they represent is visible or not. 
It's better than having to have multiple pinned Action Editors open to be able to move all keyframes of all bones at once (when blocking for example).


Also, fixed some compile errors caused by previous commit...

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/blender/src/drawaction.c
    trunk/blender/source/blender/src/editaction.c
    trunk/blender/source/blender/src/header_action.c

Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h	2007-12-19 23:14:14 UTC (rev 12951)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2007-12-19 23:29:42 UTC (rev 12952)
@@ -154,7 +154,9 @@
 		/* show sliders (if relevant) */
 	SACTION_SLIDERS	= (1<<1),	
 		/* draw time in seconds instead of time in frames */
-	SACTION_DRAWTIME = (1<<2)
+	SACTION_DRAWTIME = (1<<2),
+		/* don't filter action channels according to visibility */
+	SACTION_NOHIDE = (1<<3)
 } SACTION_FLAG;	
 
 /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2007-12-19 23:14:14 UTC (rev 12951)
+++ trunk/blender/source/blender/src/drawaction.c	2007-12-19 23:29:42 UTC (rev 12952)
@@ -617,12 +617,12 @@
 {
 	bActionChannel *achan;
 	
-	if(saction->action==NULL) return;
+	if (saction->action==NULL) return;
 	
 	for (achan=saction->action->chanbase.first; achan; achan=achan->next)
 		achan->flag &= ~ACHAN_HIDDEN;
 	
-	if (G.saction->pin==0 && OBACT) {
+	if ((saction->pin==0) && ((saction->flag & SACTION_NOHIDE)==0) && (OBACT)) {
 		Object *ob= OBACT;
 		bPoseChannel *pchan;
 		bArmature *arm= ob->data;

Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c	2007-12-19 23:14:14 UTC (rev 12951)
+++ trunk/blender/source/blender/src/editaction.c	2007-12-19 23:29:42 UTC (rev 12952)
@@ -1158,8 +1158,8 @@
 	bActionChannel *achan, *anext;
 	bConstraintChannel *conchan, *cnext;
 	
-	for (achan= actcopybuf.first; achan; achan= next) {
-		next= achan->next;
+	for (achan= actcopybuf.first; achan; achan= anext) {
+		anext= achan->next;
 		
 		if (achan->ipo) {
 			free_ipo(achan->ipo);
@@ -1174,7 +1174,7 @@
 				MEM_freeN(conchan->ipo);
 			}
 			
-			BLI_freelistN(&achan->constraintChannels, conchan);
+			BLI_freelinkN(&achan->constraintChannels, conchan);
 		}
 		
 		BLI_freelinkN(&actcopybuf, achan);

Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c	2007-12-19 23:14:14 UTC (rev 12951)
+++ trunk/blender/source/blender/src/header_action.c	2007-12-19 23:29:42 UTC (rev 12952)
@@ -93,6 +93,7 @@
 	ACTMENU_VIEW_NEXTMARKER,
 	ACTMENU_VIEW_PREVMARKER,
 	ACTMENU_VIEW_TIME,
+	ACTMENU_VIEW_NOHIDE
 };
 
 enum {
@@ -299,6 +300,9 @@
 		case ACTMENU_VIEW_TIME: /* switch between frames and seconds display */
 			G.saction->flag ^= SACTION_DRAWTIME;
 			break;
+		case ACTMENU_VIEW_NOHIDE: /* Show hidden channels */
+			G.saction->flag ^= SACTION_NOHIDE;
+			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -340,6 +344,11 @@
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
 					 ACTMENU_VIEW_SLIDERS, "");
 					 
+	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOHIDE)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+					 "Show Hidden Channels|", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+					 ACTMENU_VIEW_NOHIDE, "");
+					 
 	uiDefIconTextBut(block, BUTM, 1, (G.v2d->flag & V2D_VIEWLOCK)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
 					 "Lock Time to Other Windows|", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 





More information about the Bf-blender-cvs mailing list