diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-12-30 13:10:44 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-12-30 13:10:44 +0300 |
commit | 15518e20c05874be0304d4471a9e6e5e7ab20045 (patch) | |
tree | d7c17d0cbb8380e2b9610fd0d5454c03a0d05908 /source | |
parent | d6e8cd42325d763b65219c6652343a4a4c3a7489 (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_action/action_edit_keyframes.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_edit_keyframes.c b/source/blender/editors/space_action/action_edit_keyframes.c index 700be22b265..d9f333b4ddb 100644 --- a/source/blender/editors/space_action/action_edit_keyframes.c +++ b/source/blender/editors/space_action/action_edit_keyframes.c @@ -364,9 +364,9 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op) // 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 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op) } 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."); } } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 02c45751246..4c16a857251 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -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 @@ static void init_userdef_themes(void) 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) { |