[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13472] trunk/blender/source/blender: Bugfix for Action Editor Optimisations:

Joshua Leung aligorith at gmail.com
Wed Jan 30 11:43:44 CET 2008


Revision: 13472
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13472
Author:   aligorith
Date:     2008-01-30 11:43:44 +0100 (Wed, 30 Jan 2008)

Log Message:
-----------
Bugfix for Action Editor Optimisations:

Horizontal keyframe filtering is now optional per editor (off by default). This option may be removed in future, but currently it's there so that users can use it at their own risk. Apparently this has been causing people grief.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/blender/src/drawaction.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	2008-01-30 10:27:16 UTC (rev 13471)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2008-01-30 10:43:44 UTC (rev 13472)
@@ -221,7 +221,9 @@
 		/* don't filter action channels according to visibility */
 	SACTION_NOHIDE = (1<<3),
 		/* don't kill overlapping keyframes after transform */
-	SACTION_NOTRANSKEYCULL = (1<<4)
+	SACTION_NOTRANSKEYCULL = (1<<4),
+		/* don't include keyframes that are out of view */
+	SACTION_HORIZOPTIMISEON = (1<<5)
 } SACTION_FLAG;	
 
 /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2008-01-30 10:27:16 UTC (rev 13471)
+++ trunk/blender/source/blender/src/drawaction.c	2008-01-30 10:43:44 UTC (rev 13472)
@@ -1256,8 +1256,8 @@
 	aki.start= G.v2d->cur.xmin - 10;
 	aki.end= G.v2d->cur.xmax + 10;
 	
-	/* only pass pointer for Action Editor (for now) */
-	if (curarea->spacetype == SPACE_ACTION)
+	/* only pass pointer for Action Editor if enabled (for now) */
+	if ((curarea->spacetype == SPACE_ACTION) && (G.saction->flag & SACTION_HORIZOPTIMISEON))
 		return &aki;
 	else	
 		return NULL;

Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c	2008-01-30 10:27:16 UTC (rev 13471)
+++ trunk/blender/source/blender/src/header_action.c	2008-01-30 10:43:44 UTC (rev 13472)
@@ -99,7 +99,8 @@
 	ACTMENU_VIEW_OPENLEVELS,
 	ACTMENU_VIEW_CLOSELEVELS,
 	ACTMENU_VIEW_EXPANDALL,
-	ACTMENU_VIEW_TRANSDELDUPS
+	ACTMENU_VIEW_TRANSDELDUPS,
+	ACTMENU_VIEW_HORIZOPTIMISE
 };
 
 enum {
@@ -337,6 +338,9 @@
 		case ACTMENU_VIEW_TRANSDELDUPS: /* Don't delete duplicate/overlapping keyframes after transform */
 			G.saction->flag ^= SACTION_NOTRANSKEYCULL;
 			break;
+		case ACTMENU_VIEW_HORIZOPTIMISE: /* Include keyframes not in view (horizontally) when preparing to draw */
+			G.saction->flag ^= SACTION_HORIZOPTIMISEON;
+			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -382,6 +386,12 @@
 					 "Show Hidden Channels|", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
 					 ACTMENU_VIEW_NOHIDE, "");
+					 
+		// this option may get removed in future
+	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+					 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+					 ACTMENU_VIEW_HORIZOPTIMISE, "");
 			
 		// this option may get removed in future... 
 	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 





More information about the Bf-blender-cvs mailing list