[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18170] branches/blender2.5/blender/source /blender: 2.5 - Action Editor stuff

Joshua Leung aligorith at gmail.com
Tue Dec 30 11:10:58 CET 2008


Revision: 18170
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18170
Author:   aligorith
Date:     2008-12-30 11:10:44 +0100 (Tue, 30 Dec 2008)

Log Message:
-----------
2.5 - Action Editor stuff

* Added old theme-set version patch for new Dopesheet channel colours
* Removed warnings in action_edit_keyframes.c. I need an example of how to add error reports for the code that this concerned.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_action/action_edit_keyframes.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c

Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_edit_keyframes.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_edit_keyframes.c	2008-12-30 08:25:36 UTC (rev 18169)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_edit_keyframes.c	2008-12-30 10:10:44 UTC (rev 18170)
@@ -364,9 +364,9 @@
 		// FIXME...
 	}
 	else {
-		if (copy_action_keys(&ac)) {
+		if (copy_action_keys(&ac)) {	
+			// XXX errors - need a way to inform the user 
 			printf("Action Copy: No keyframes copied to copy-paste buffer\n");
-			uiPupmenuError(C, "No keyframes copied to copy-paste buffer");
 		}
 	}
 	
@@ -408,8 +408,8 @@
 	}
 	else {
 		if (paste_action_keys(&ac)) {
+			// XXX errors - need a way to inform the user 
 			printf("Action Paste: Nothing to paste, as Copy-Paste buffer was empty.\n");
-			uiPupmenuError(C, "Nothing to paste, as Copy-Paste buffer was empty.");
 		}
 	}
 	

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2008-12-30 08:25:36 UTC (rev 18169)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2008-12-30 10:10:44 UTC (rev 18170)
@@ -49,6 +49,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
 
+#include "DNA_ipo_types.h"
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
@@ -321,6 +322,23 @@
 			SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255);
 		}
 	}
+	if ((G.main->versionfile < 248) || (G.main->versionfile == 248 && G.main->subversionfile < 3)) {
+		bTheme *btheme;
+		
+		/* adjust themes */
+		for (btheme= U.themes.first; btheme; btheme= btheme->next) {
+			/* DopeSheet - (Object) Channel color */
+			SETCOL(btheme->tact.ds_channel, 0x36, 0x13, 0xca, 255);
+			SETCOL(btheme->tact.ds_subchannel, 0x60, 0x43, 0xd2, 255);
+		}
+		
+		/* adjust grease-pencil distances */
+		U.gp_manhattendist= 1;
+		U.gp_euclideandist= 2;
+		
+		/* adjust default interpolation for new IPO-curves */
+		U.ipo_new= IPO_BEZ;
+	}
 	
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {





More information about the Bf-blender-cvs mailing list